Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Show email for staged users in user cards. (#7354)

This commit is contained in:
Dan Ungureanu 2019-04-12 12:50:43 +03:00 committed by GitHub
parent 2fea29a355
commit 0e9a0a31f5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
app/assets/javascripts/discourse/templates/components/user-card-contents.hbs
View File

@ -145,16 +145,16 @@
</div> </div>
{{/if}} {{/if}}
{{#if user.time_read}} <div class="card-row fourth-row">
<div class="card-row fourth-row"> {{#unless user.profile_hidden}}
{{#unless user.profile_hidden}} <div class="metadata">
<div class="metadata"> {{#if user.last_posted_at}}
{{#if user.last_posted_at}} <h3><span class='desc'>{{i18n 'last_post'}}</span>
<h3><span class='desc'>{{i18n 'last_post'}}</span> {{format-date user.last_posted_at leaveAgo="true"}}</h3>
{{format-date user.last_posted_at leaveAgo="true"}}</h3> {{/if}}
{{/if}} <h3><span class='desc'>{{i18n 'joined'}}</span>
<h3><span class='desc'>{{i18n 'joined'}}</span> {{format-date user.created_at leaveAgo="true"}}</h3>
{{format-date user.created_at leaveAgo="true"}}</h3> {{#if user.time_read}}
<h3 title="{{timeReadTooltip}}"> <h3 title="{{timeReadTooltip}}">
<span class='desc'>{{i18n 'time_read'}}</span> <span class='desc'>{{i18n 'time_read'}}</span>
{{format-duration user.time_read}} {{format-duration user.time_read}}
@ -162,27 +162,27 @@
<span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span> <span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span>
{{/if}} {{/if}}
</h3> </h3>
{{#if showCheckEmail}} {{/if}}
<h3 class="email"> {{#if showCheckEmail}}
{{d-icon "far-envelope" title="user.email.title"}} <h3 class="email">
{{#if user.email}} {{d-icon "far-envelope" title="user.email.title"}}
{{user.email}} {{#if user.email}}
{{else}} {{user.email}}
{{d-button {{else}}
action=(action "checkEmail") {{d-button
actionParam=user action=(action "checkEmail")
icon="far-envelope" actionParam=user
label="admin.users.check_email.text" icon="far-envelope"
class="btn-primary"}} label="admin.users.check_email.text"
{{/if}} class="btn-primary"}}
</h3> {{/if}}
{{/if}} </h3>
{{plugin-outlet name="user-card-metadata" args=(hash user=user)}} {{/if}}
</div> {{plugin-outlet name="user-card-metadata" args=(hash user=user)}}
{{/unless}} </div>
{{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}} {{/unless}}
</div> {{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}}
{{/if}} </div>
{{#if publicUserFields}} {{#if publicUserFields}}
<div class="card-row fifth-row"> <div class="card-row fifth-row">