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

UX: Don't show admin 2FA edit icon on profile of other users.

This commit is contained in:
Guo Xiang Tan 2018-02-23 13:51:02 +08:00
parent 845cec3ba0
commit 4250ab522a
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/mixins/can-check-emails.js.es6
View File

@ -1,9 +1,9 @@
import { propertyEqual, setting } from 'discourse/lib/computed';
export default Ember.Mixin.create({
isOwnEmail: propertyEqual("model.id", "currentUser.id"),
isCurrentUser: propertyEqual("model.id", "currentUser.id"),
showEmailOnProfile: setting("show_email_on_profile"),
canStaffCheckEmails: Em.computed.and("showEmailOnProfile", "currentUser.staff"),
canAdminCheckEmails: Em.computed.alias("currentUser.admin"),
canCheckEmails: Em.computed.or("isOwnEmail", "canStaffCheckEmails", "canAdminCheckEmails"),
canCheckEmails: Em.computed.or("isCurrentUser", "canStaffCheckEmails", "canAdminCheckEmails"),
});

9
app/assets/javascripts/discourse/templates/preferences/account.hbs
View File

@ -66,6 +66,7 @@
{{passwordProgress}}
</div>
</div>
<div class="control-group pref-second-factor">
<label class="control-label">{{i18n 'user.second_factor.title'}}</label>
@ -84,9 +85,11 @@
{{/if}}
</b>
{{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}}
{{/link-to}}
{{#if isCurrentUser}}
{{#link-to "preferences.second-factor" class="btn btn-small btn-icon pad-left no-text"}}
{{d-icon "pencil"}}
{{/link-to}}
{{/if}}
</div>
</div>
{{/if}}