diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index db6502c..9069855 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -84,4 +84,5 @@
@all_columns = Settings::PlanList::ALL_COLUMNS
end
end
+
end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 636c44a..4d6bd4f 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -3,7 +3,9 @@
def admin_index
authorize User
- @users = current_user.organisation.users.includes(:roles, :project_groups)
+
+ @users = User.where(organisation: current_user.organisation).includes(:project_groups)
+
respond_to do |format|
format.html # index.html.erb
end
diff --git a/app/views/users/admin_grant_permissions.html.erb b/app/views/users/admin_grant_permissions.html.erb
index ee27a6d..ca5a170 100644
--- a/app/views/users/admin_grant_permissions.html.erb
+++ b/app/views/users/admin_grant_permissions.html.erb
@@ -1,7 +1,7 @@
<%= stylesheet_link_tag "admin" %>
- <%= t('org_admin.edit_user_privleges') %>
+ <%= t('org_admin.edit_user_privileges') %>
diff --git a/app/views/users/admin_index.html.erb b/app/views/users/admin_index.html.erb
index 7e6a37f..ba9807f 100644
--- a/app/views/users/admin_index.html.erb
+++ b/app/views/users/admin_index.html.erb
@@ -12,7 +12,7 @@
<%= t('org_admin.user_name') %> |
<%= t('org_admin.last_logged_in') %> |
<%= t('org_admin.how_many_plans') %> |
- <%= t('org_admin.is_org_admin') %> |
+ <%= t('org_admin.privileges') %> |
diff --git a/config/locales/en-UK.yml b/config/locales/en-UK.yml
index 8f56644..7d0bedc 100644
--- a/config/locales/en-UK.yml
+++ b/config/locales/en-UK.yml
@@ -149,6 +149,7 @@
user_name: "Email address"
last_logged_in: "Last logged in"
how_many_plans: "How many plans?"
+ privileges: "Privileges"
user_text_html: "Below is a list of users registered for your organisation. You can sort the data by each field."
org_name: "Name"
org_abbr: "Abbreviation"
@@ -179,8 +180,8 @@
option_default_label: "Default"
user_org_created: 'User org role was successfully created.'
user_org_updated: 'User org role was successfully updated.'
- api_privleges: 'API Privleges?'
- edit_user_privleges: 'Edit User Privleges'
+ api_privileges: 'API Privleges?'
+ edit_user_privileges: 'Edit User Privileges'
guidance:
guidance_list: "Guidance list"
diff --git a/config/locales/en-US.yml b/config/locales/en-US.yml
index 71416ba..2535fd6 100644
--- a/config/locales/en-US.yml
+++ b/config/locales/en-US.yml
@@ -139,6 +139,7 @@
user_name: "Email address"
last_logged_in: "Last logged in"
how_many_plans: "How many plans?"
+ privileges: "Permissions"
user_text_html: "Below is a list of users registered for your organization. You can sort the data by each field."
org_name: "Name"
org_abbr: "Abbreviation"
@@ -171,7 +172,8 @@
option_default_label: "Default"
user_org_created: 'User org role was successfully created.'
user_org_updated: 'User org role was successfully updated.'
- api_privleges: 'API Privleges?'
+ api_privileges: 'API Permissions?'
+ edit_user_privileges: 'Edit User Permissions'
guidance:
guidance_list: "Guidance list"