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

UX: Consolidate "Admins" and "Moderators" into "Staff" on admin users 

list
This commit is contained in:
Robin Ward 2014-11-26 13:10:12 -05:00
parent a3e53e0d28
commit cb124d5836
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/assets/javascripts/admin/templates/users_list.hbs
View File

@ -6,8 +6,7 @@
{{#if siteSettings.must_approve_users}} {{#if siteSettings.must_approve_users}}
<li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n admin.users.nav.pending}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.show' 'pending'}}{{i18n admin.users.nav.pending}}{{/link-to}}</li>
{{/if}} {{/if}}
<li>{{#link-to 'adminUsersList.show' 'admins'}}{{i18n admin.users.nav.admins}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.show' 'staff'}}{{i18n admin.users.nav.staff}}{{/link-to}}</li>
<li>{{#link-to 'adminUsersList.show' 'moderators'}}{{i18n admin.users.nav.moderators}}{{/link-to}}</li>
<li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n admin.users.nav.suspended}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.show' 'suspended'}}{{i18n admin.users.nav.suspended}}{{/link-to}}</li>
<li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.show' 'blocked'}}{{i18n admin.users.nav.blocked}}{{/link-to}}</li>
</ul> </ul>

4
config/locales/client.en.yml
View File

@ -1892,8 +1892,7 @@ en:
new: "New" new: "New"
active: "Active" active: "Active"
pending: "Pending" pending: "Pending"
admins: 'Admins' staff: 'Staff'
moderators: 'Mods'
suspended: 'Suspended' suspended: 'Suspended'
blocked: 'Blocked' blocked: 'Blocked'
approved: "Approved?" approved: "Approved?"
@ -1912,6 +1911,7 @@ en:
regular: 'Users at Trust Level 2 (Member)' regular: 'Users at Trust Level 2 (Member)'
leader: 'Users at Trust Level 3 (Regular)' leader: 'Users at Trust Level 3 (Regular)'
elder: 'Users at Trust Level 4 (Leader)' elder: 'Users at Trust Level 4 (Leader)'
staff: "Staff"
admins: 'Admin Users' admins: 'Admin Users'
moderators: 'Moderators' moderators: 'Moderators'
blocked: 'Blocked Users' blocked: 'Blocked Users'

1
lib/admin_user_index_query.rb
View File

@ -49,6 +49,7 @@ class AdminUserIndexQuery
def filter_by_query_classification def filter_by_query_classification
case params[:query] case params[:query]
when 'staff' then @query.where("admin or moderator")
when 'admins' then @query.where(admin: true) when 'admins' then @query.where(admin: true)
when 'moderators' then @query.where(moderator: true) when 'moderators' then @query.where(moderator: true)
when 'blocked' then @query.blocked when 'blocked' then @query.blocked