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

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

@ -145,7 +145,6 @@
</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">
@ -155,6 +154,7 @@
{{/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,6 +162,7 @@
<span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span> <span>({{i18n 'time_read_recently' time_read=recentTimeRead}})</span>
{{/if}} {{/if}}
</h3> </h3>
{{/if}}
{{#if showCheckEmail}} {{#if showCheckEmail}}
<h3 class="email"> <h3 class="email">
{{d-icon "far-envelope" title="user.email.title"}} {{d-icon "far-envelope" title="user.email.title"}}
@ -182,7 +183,6 @@
{{/unless}} {{/unless}}
{{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}} {{plugin-outlet name="user-card-after-metadata" args=(hash user=user)}}
</div> </div>
{{/if}}
{{#if publicUserFields}} {{#if publicUserFields}}
<div class="card-row fifth-row"> <div class="card-row fifth-row">