codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2024-11-27 17:46:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

correct bugs

Browse source
This commit is contained in:
Sam 2016-06-08 15:24:27 +10:00
parent b2f26eaa60
commit 614f4ca228
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/discourse/controllers/user.js.es6
View file

@ -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;
},

2
app/assets/javascripts/discourse/templates/user/user.hbs
View file

@ -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>