[PATCH conductor] Fix for bz #765907: change permissions tab label from 'Users' to 'Role Assignments'

Scott Seago sseago at redhat.com
Tue Dec 13 20:20:27 UTC 2011


---
 src/app/controllers/application_controller.rb |    2 +-
 src/app/views/deployables/show.html.haml      |    2 +-
 src/config/locales/en.yml                     |    1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/app/controllers/application_controller.rb b/src/app/controllers/application_controller.rb
index 5529a02..053a87b 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -296,7 +296,7 @@ class ApplicationController < ActionController::Base
     if perm_obj.has_privilege(current_user, Privilege::PERM_VIEW)
       @roles = Role.find_all_by_scope(@permission_object.class.name)
       if @tabs
-        @tabs << {:name => t('users.users'),
+        @tabs << {:name => t('role_assignments'),
                   :view => 'permissions',
                   :id => 'permissions',
                   :count => perm_obj.permissions.count}
diff --git a/src/app/views/deployables/show.html.haml b/src/app/views/deployables/show.html.haml
index 6093a34..95e00cf 100644
--- a/src/app/views/deployables/show.html.haml
+++ b/src/app/views/deployables/show.html.haml
@@ -106,6 +106,6 @@
 - if check_privilege(Privilege::PERM_VIEW, at permission_object)
   %section.admin-content-section
     %header
-      %h2.roles= t('users.users')
+      %h2.roles= t('role_assignments')
     .content
       = render :partial => 'permissions/permissions'
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 85f82d2..05feeaf 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -99,6 +99,7 @@ en:
   define_locales: Define Locales
   permissions: Permissions
   role: Role
+  role_assignments: Role Assignments
   user: User
   privileges: Privileges
   general_settings: General Settings
-- 
1.7.6.4




More information about the aeolus-devel mailing list