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