aligned Super User Rights and Catalog Manager Rights [#166136127]

sparc-request · Oct 16, 2019 · 3bbb9d9 · 3bbb9d9
1 parent 1b858fe
commit 3bbb9d9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/app/views/catalog_manager/organizations/_user_rights_row.html.haml b/app/views/catalog_manager/organizations/_user_rights_row.html.haml
@@ -39,9 +39,12 @@
       .row
         .col-sm-6
           = label_tag :access_empty_protocols, t(:catalog_manager)[:organization_form][:user_rights][:access_empty_protocols], class: 'non_bold_label'
-          = check_box_tag :access_empty_protocols, true, su.try(:access_empty_protocols), { id: "su-access-empty-protocols-#{user.id}", class: "su-access-empty-protocols", data: { identity_id: user.id, organization_id: organization.id } }
         .col-sm-6
           = label_tag :billing_manager, t(:catalog_manager)[:organization_form][:user_rights][:billing_manager], class: 'non_bold_label'
+      .row
+        .col-sm-6
+          = check_box_tag :access_empty_protocols, true, su.try(:access_empty_protocols), { id: "su-access-empty-protocols-#{user.id}", class: "su-access-empty-protocols", data: { identity_id: user.id, organization_id: organization.id } }
+        .col-sm-6
           = check_box_tag :billing_manager, true, su.try(:billing_manager), { id: "su-billing-manager-#{user.id}", class: "su-billing-manager", data: { identity_id: user.id, organization_id: organization.id } }
 
   .col-sm-2.text-center
@@ -52,8 +55,12 @@
 
     - if !cm.nil?
       .form_row
-      = label_tag :edit_historic_data, t(:catalog_manager)[:organization_form][:user_rights][:edit_historic_data], class: 'non_bold_label'
-      = check_box_tag :edit_historic_data, true, cm.try(:edit_historic_data), { id: "cm-edit-historic-data-#{user.id}", class: "cm-edit-historic-data", data: { identity_id: user.id, organization_id: organization.id } }
+      .row
+        .col-sm-12
+          = label_tag :edit_historic_data, t(:catalog_manager)[:organization_form][:user_rights][:edit_historic_data], class: 'non_bold_label'
+      .row
+        .col-sm-12
+          = check_box_tag :edit_historic_data, true, cm.try(:edit_historic_data), { id: "cm-edit-historic-data-#{user.id}", class: "cm-edit-historic-data", data: { identity_id: user.id, organization_id: organization.id } }
   - unless organization.type == "Institution" or !organization.process_ssrs
     .col-sm-3.text-center
       = check_box_tag :service_provider, true, !cp.nil?, { class: "service-provider-checkbox", data: { identity_id: user.id, organization_id: organization.id } }

diff --git a/config/locales/catalog_manager.en.yml b/config/locales/catalog_manager.en.yml
@@ -56,10 +56,10 @@ en:
       user_rights:
         name_email: "Name, Email"
         super_user: "Super User"
-        access_empty_protocols: "Access Empty Protocols:"
-        billing_manager: "Billing Manager Rights"
+        access_empty_protocols: "Empty Protocols"
+        billing_manager: "Billing Manager"
         catalog_manager: "Catalog Manager"
-        edit_historic_data: "Edit Historical Data:"
+        edit_historic_data: "Edit Historical Data"
         service_provider: "Service Provider"
         primary_contact: "Primary Contact:"
         hold_emails: "Hold Emails:"