codeninjasllc/discourse
1
0
Fork 0
mirror of https://github.com/codeninjasllc/discourse.git synced 2025-02-17 04:01:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

FIX: admin trust level user list URL should be consistent with new naming

Browse source
This commit is contained in:
Arpit Jalan 2015-11-23 14:01:14 +05:30
parent c7aaa56918
commit db2799507b
5 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/admin/templates/components/admin-report-trust-level-counts.hbs
View file

@ -1,6 +1,6 @@
<td class="title">{{report.title}}</td> <td class="title">{{report.title}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{value-at-tl report.data level="0"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'newuser'}}{{value-at-tl report.data level="0"}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{value-at-tl report.data level="1"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'basic'}}{{value-at-tl report.data level="1"}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="2"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'member'}}{{value-at-tl report.data level="2"}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="3"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'regular'}}{{value-at-tl report.data level="3"}}{{/link-to}}</td>
<td class="value">{{#link-to 'adminUsersList.show' 'elder'}}{{value-at-tl report.data level="4"}}{{/link-to}}</td> <td class="value">{{#link-to 'adminUsersList.show' 'leader'}}{{value-at-tl report.data level="4"}}{{/link-to}}</td>

2
app/assets/javascripts/admin/templates/user-tl3-requirements.hbs
View file

@ -2,7 +2,7 @@
<div class='span15'> <div class='span15'>
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li>{{#link-to 'adminUser' model}}<i class="fa fa-caret-left"></i> &nbsp;{{model.username}}{{/link-to}}</li> <li>{{#link-to 'adminUser' model}}<i class="fa fa-caret-left"></i> &nbsp;{{model.username}}{{/link-to}}</li>
<li>{{#link-to 'adminUsersList.show' 'regular'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li> <li>{{#link-to 'adminUsersList.show' 'member'}}{{i18n 'admin.user.trust_level_2_users'}}{{/link-to}}</li>
</ul> </ul>
</div> </div>
</div> </div>

6
config/locales/client.en.yml
View file

@ -2303,9 +2303,9 @@ en:
pending: 'Users Pending Review' pending: 'Users Pending Review'
newuser: 'Users at Trust Level 0 (New User)' newuser: 'Users at Trust Level 0 (New User)'
basic: 'Users at Trust Level 1 (Basic User)' basic: 'Users at Trust Level 1 (Basic User)'
regular: 'Users at Trust Level 2 (Member)' member: 'Users at Trust Level 2 (Member)'
leader: 'Users at Trust Level 3 (Regular)' regular: 'Users at Trust Level 3 (Regular)'
elder: 'Users at Trust Level 4 (Leader)' leader: 'Users at Trust Level 4 (Leader)'
staff: "Staff" staff: "Staff"
admins: 'Admin Users' admins: 'Admin Users'
moderators: 'Moderators' moderators: 'Moderators'

6
config/locales/server.en.yml
View file

@ -367,11 +367,11 @@ en:
title: "new user" title: "new user"
basic: basic:
title: "basic user" title: "basic user"
regular: member:
title: "member" title: "member"
leader: regular:
title: "regular" title: "regular"
elder: leader:
title: "leader" title: "leader"
change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first" change_failed_explanation: "You attempted to demote %{user_name} to '%{new_trust_level}'. However their trust level is already '%{current_trust_level}'. %{user_name} will remain at '%{current_trust_level}' - if you wish to demote user lock trust level first"

2
lib/trust_level.rb
View file

@ -14,7 +14,7 @@ class TrustLevel
end end
def levels def levels
@levels ||= Enum.new(:newuser, :basic, :regular, :leader, :elder, start: 0) @levels ||= Enum.new(:newuser, :basic, :member, :regular, :leader, start: 0)
end end
def all def all