---
src/app/controllers/application_controller.rb | 6 +++---
src/app/controllers/users_controller.rb | 6 +++++-
src/config/locales/en.yml | 5 ++++-
3 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/app/controllers/application_controller.rb
b/src/app/controllers/application_controller.rb
index 4cf4476..3f365af 100644
--- a/src/app/controllers/application_controller.rb
+++ b/src/app/controllers/application_controller.rb
@@ -251,9 +251,9 @@ class ApplicationController < ActionController::Base
end
def set_admin_users_tabs(tab)
- @tabs = [{:name => 'Users', :url => users_url, :id =>
'catalogs'},
- #{:name => 'Groups', :url => groups_url, :id =>
'groups'},
- {:name => 'Global Role Grants', :url => permissions_url, :id
=> 'permissions'},
+ @tabs = [{:name => t('application_controller.admin_tabs.users'), :url
=> users_url, :id => 'users'},
+ #{:name => t('application_controller.admin_tabs.groups'), :url
=> groups_url, :id => 'groups'},
+ {:name => t('application_controller.admin_tabs.permissions'),
:url => permissions_url, :id => 'permissions'},
]
unless @details_tab = @tabs.find {|t| t[:id] == tab}
raise "Tab '#{tab}' doesn't exist"
diff --git a/src/app/controllers/users_controller.rb
b/src/app/controllers/users_controller.rb
index 23afdce..38ac776 100644
--- a/src/app/controllers/users_controller.rb
+++ b/src/app/controllers/users_controller.rb
@@ -24,10 +24,14 @@ class UsersController < ApplicationController
require_privilege(Privilege::VIEW, User)
clear_breadcrumbs
save_breadcrumb(users_path)
- set_admin_users_tabs 'catalogs'
+ set_admin_users_tabs 'users'
@params = params
load_headers
load_users
+ respond_to do |format|
+ format.html
+ format.js { render :partial => 'list' }
+ end
end
def new
diff --git a/src/config/locales/en.yml b/src/config/locales/en.yml
index 64227e1..b45802a 100644
--- a/src/config/locales/en.yml
+++ b/src/config/locales/en.yml
@@ -926,6 +926,9 @@ en:
catalogs: Catalogs
realms: Realms
hardware: Hardware
+ users: Users
+ groups: Groups
+ permissions: Global Role Grants
realm_mappings:
new:
- create_new: Create a new Realm Mapping
\ No newline at end of file
+ create_new: Create a new Realm Mapping
--
1.7.6.4