correct bugs
This commit is contained in:
parent
b2f26eaa60
commit
614f4ca228
|
@ -41,7 +41,7 @@ export default Ember.Controller.extend(CanCheckEmails, {
|
|||
return viewingSelf || staff;
|
||||
},
|
||||
|
||||
@computed('model.user.name')
|
||||
@computed('model.name')
|
||||
nameFirst(name) {
|
||||
return !this.get('siteSettings.prioritize_username_in_ux') && name && name.trim().length > 0;
|
||||
},
|
||||
|
|
|
@ -58,7 +58,7 @@
|
|||
</section>
|
||||
|
||||
<div class="primary-textual">
|
||||
<h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.user model.username}} {{user-status model currentUser=currentUser}}</h1>
|
||||
<h1 class="{{if nameFirst "full-name" "username"}}">{{if nameFirst model.name model.username}} {{user-status model currentUser=currentUser}}</h1>
|
||||
<h2 class="{{if nameFirst "username" "full-name"}}">{{#if nameFirst}}{{model.username}}{{else}}{{model.name}}{{/if}}</h2>
|
||||
{{#if model.title}}
|
||||
<h3>{{model.title}}</h3>
|
||||
|
|
Loading…
Reference in New Issue