Merge pull request #172 from DMPRoadmap/issue2511

fixed issue with being unable to grant user specific permission to ch…
CDLUC3 · May 13, 2020 · 592fe47 · 592fe47
2 parents be2a7de + 1a2c48e
commit 592fe47
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/app/controllers/org_admin/templates_controller.rb b/app/controllers/org_admin/templates_controller.rb
@@ -41,7 +41,7 @@ def organisational
                           .where(customization_of: nil, org_id: current_user.org.id)
       published = templates.select { |t| t.published? || t.draft? }.length
 
-      @orgs  = current_user.can_super_admin? ? Org.all : nil
+      @orgs  = current_user.can_change_org? ? Org.all : nil
       @title = if current_user.can_super_admin?
                  _("%{org_name} Templates") % { org_name: current_user.org.name }
                else

diff --git a/app/javascript/views/usage/index.js b/app/javascript/views/usage/index.js
@@ -14,12 +14,15 @@ $(() => {
 
   // attach listener to separator select menu
   // on change look for "stat" elements and chnage their query param
-  document.getElementById('csv-field-sep').addEventListener('click', (e) => {
-    const statElems = document.getElementsByClassName('stat');
-    const newSep = 'sep='.concat(encodeURIComponent(e.target.value));
-    const changeStatFn = changeStatFnGen(newSep);
-    Array.from(statElems).forEach(changeStatFn);
-  });
+  const fieldSep = document.getElementById('csv-field-sep');
+  if (fieldSep !== null) {
+    fieldSep.addEventListener('click', (e) => {
+      const statElems = document.getElementsByClassName('stat');
+      const newSep = 'sep='.concat(encodeURIComponent(e.target.value));
+      const changeStatFn = changeStatFnGen(newSep);
+      Array.from(statElems).forEach(changeStatFn);
+    });
+  }
 
   initializeCharts();
 

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -232,12 +232,12 @@ def identifier_for(scheme)
     user_identifiers.where(identifier_scheme: scheme).first
   end
 
-  # Checks if the user is a super admin. If the user has any privelege which requires
+  # Checks if the user is a super admin. If the user has ALL privelege which requires
   # them to see the super admin page then they are a super admin.
   #
   # Returns Boolean
   def can_super_admin?
-    self.can_add_orgs? || self.can_grant_api_to_orgs? || self.can_change_org?
+    can_add_orgs? && can_grant_api_to_orgs? && can_change_org?
   end
 
   # Checks if the user is an organisation admin if the user has any privlege which

diff --git a/app/policies/user_policy.rb b/app/policies/user_policy.rb
@@ -26,7 +26,7 @@ def admin_update_permissions?
 
   # Allows the user to swap their org affiliation on the fly
   def org_swap?
-    signed_in_user.can_super_admin?
+    signed_in_user.can_change_org?
   end
 
   def activate?

diff --git a/app/views/org_admin/templates/index.html.erb b/app/views/org_admin/templates/index.html.erb
@@ -4,7 +4,7 @@
     <h1><%= _('Templates') %></h1>
   </div>
 
-  <% if current_user.can_super_admin? %>
+  <% if current_user.can_change_org? %>
     <div class="col-md-12">
       <p>
         <%= _('If you would like to modify one of the templates below, you must first change your organisation affiliation.') %>
@@ -117,4 +117,4 @@
     </a>
 
   </div>
-</div>
+</div>