IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: Properly reset controller of admin-user-index. (#6760)

Browse Source
This commit is contained in:
Bianca Nenciu
2018-12-17 16:28:29 +02:00
committed by Régis Hanol
parent 1023003eba
commit f0027961c7
5 changed files with 105 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/assets/javascripts/admin/templates/user-index.hbs
View File

@@ -19,41 +19,17 @@
</div>
<div class='display-row username'>
<div class='field'>{{i18n 'user.username.title'}}</div>
<div class='value'>
{{#if editingUsername}}
{{text-field value=userUsernameValue autofocus="autofocus"}}
{{else}}
<span {{action "toggleUsernameEdit"}}>{{model.username}}</span>
{{/if}}
</div>
<div class='controls'>
{{#if editingUsername}}
{{d-button class="btn-default" action="saveUsername" label="admin.user_fields.save"}}
<a href {{action "toggleUsernameEdit"}}>{{i18n 'cancel'}}</a>
{{else}}
{{d-button class="btn-default" action="toggleUsernameEdit" icon="pencil"}}
{{/if}}
</div>
{{admin-editable-field name='user.username.title'
value=model.username
action=(action 'saveUsername')
editing=editingUsername}}
</div>
<div class='display-row'>
<div class='field'>{{i18n 'user.name.title'}}</div>
<div class='value'>
{{#if editingName}}
{{text-field value=userNameValue autofocus="autofocus"}}
{{else}}
<span {{action "toggleNameEdit"}}>{{model.name}}</span>
{{/if}}
</div>
<div class='controls'>
{{#if editingName}}
{{d-button class="btn-default" action="saveName" label="admin.user_fields.save"}}
<a href {{action "toggleNameEdit"}}>{{i18n 'cancel'}}</a>
{{else}}
{{d-button class="btn-default" action="toggleNameEdit" icon="pencil"}}
{{/if}}
</div>
{{admin-editable-field name='user.name.title'
value=model.name
action=(action 'saveName')
editing=editingName}}
</div>
{{plugin-outlet name="admin-user-below-names" args=(hash user=model) tagName='' connectorTagName=''}}
@@ -130,22 +106,10 @@
</div>
<div class='display-row'>
<div class='field'>{{i18n 'user.title.title'}}</div>
<div class='value'>
{{#if editingTitle}}
{{text-field value=userTitleValue autofocus="autofocus"}}
{{else}}
<span {{action "toggleTitleEdit"}}>{{model.title}}&nbsp;</span>
{{/if}}
</div>
<div class='controls'>
{{#if editingTitle}}
{{d-button class="btn-default" action="saveTitle" label="admin.user_fields.save"}}
<a href {{action "toggleTitleEdit"}}>{{i18n 'cancel'}}</a>
{{else}}
{{d-button class="btn-default" action="toggleTitleEdit" icon="pencil"}}
{{/if}}
</div>
{{admin-editable-field name='user.title.title'
value=model.title
action=(action 'saveTitle')
editing=editingTitle}}
</div>
<div class='display-row last-ip'>