diff --git a/app/helpers/perms_helper.rb b/app/helpers/perms_helper.rb index a8a6692..6a007b8 100644 --- a/app/helpers/perms_helper.rb +++ b/app/helpers/perms_helper.rb @@ -4,11 +4,11 @@ { :add_organisations => _('Add organisations'), :change_org_affiliation => _('Change affiliation'), - :grant_permissions => _('Grant permissions'), - :modify_templates => _('Modify templates'), - :modify_guidance => _('Modify guidance'), + :grant_permissions => _('Manage user privileges'), + :modify_templates => _('Manage templates'), + :modify_guidance => _('Manage guidance'), :use_api => _('API rights'), - :change_org_details => _('Change organisation details'), + :change_org_details => _('Manage organisation details'), :grant_api_to_orgs => _('Grant API to organisations') } end diff --git a/app/models/user.rb b/app/models/user.rb index 2090de0..4fca8fc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -229,9 +229,6 @@ break random_token unless User.exists?(api_token: random_token) end update_column(:api_token, api_token) unless new_record? - deliver_if(recipients: self, key: 'users.admin_privileges') do |r| - UserMailer.api_token_granted_notification(r).deliver_now - end end end diff --git a/app/views/user_mailer/admin_privileges.html.erb b/app/views/user_mailer/admin_privileges.html.erb index b269212..08ecdb1 100644 --- a/app/views/user_mailer/admin_privileges.html.erb +++ b/app/views/user_mailer/admin_privileges.html.erb @@ -20,6 +20,6 @@
<% end %>- <%= raw _('More information about administering the %{tool_name} for users at your organisation is available at %{help_url}.') %{ :tool_name => tool_name, :help_url => link_to('help page', help_url)} %> + <%= raw _('More information about administering the %{tool_name} for users at your organisation is available at the %{help_url}.') %{ :tool_name => tool_name, :help_url => link_to('help for administrators page', help_url)} %>
<%= render partial: 'email_signature' %> \ No newline at end of file