Fix/user permissions (#462)

Fix show all reports for sysadmins
datopian · Jun 22, 2021 · 860eecb · 860eecb
1 parent bd1f7b5
commit 860eecb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/ckanext/querytool/templates/group/reports.html b/ckanext/querytool/templates/group/reports.html
@@ -18,7 +18,7 @@
         {% set delete_url = h.url_for('querytool_delete', querytool='/' + querytool.name) %}
         {% set member_type = h.get_user_permission_type(c.userobj, querytool.group) %}
 
-        {% if h.get_groups_for_user(c.userobj, querytool.group) and ((member_type == 'member' and querytool.private != True) or member_type == 'admin') %}
+        {% if h.get_groups_for_user(c.userobj, querytool.group) and ((member_type == 'member' and querytool.private != True) or member_type == 'admin') or c.userobj.sysadmin %}
         <div class="applicaitons-box">
 
           <div class="thumb">
@@ -48,7 +48,7 @@ <h2>{{ querytool.title }}</h2>
               {% set user_permission = h.get_groups_for_user(c.userobj, querytool.group) %}
               {% set user_type = h.get_user_permission_type(c.userobj, querytool.group) %}
 
-              {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' %}
+              {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' or c.userobj.sysadmin %}
               <li><a class="btn btn-minimal" role="button" href="{{ edit_data_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit filters and data') }}</a></li>
               <li><a class="btn btn-minimal" role="button" href="{{ edit_visualizations_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit visualizations') }}</a></li>
               <li><a class="btn btn-minimal" role="button" href="{{ h.url_for('querytool_public_read', name=querytool.name) }}" type="submit" name="view"><span class="fa fa-eye" aria-hidden="true"></span> {{ _('View') }}</a></li>
@@ -92,7 +92,7 @@ <h2>{{ querytool.title }}</h2>
             {% set user_permission = h.get_groups_for_user(c.userobj, querytool.group) %}
             {% set user_type = h.get_user_permission_type(c.userobj, querytool.group) %}
 
-            {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' %}
+            {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' or c.userobj.sysadmin %}
             <li><a class="btn" href="{{ edit_data_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit filters and data') }}</a></li>
             <li><a class="btn" href="{{ edit_visualizations_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit visualizations') }}</a></li>
             <li><a class="btn" href="{{ h.url_for('querytool_public_read', name=querytool.name) }}" type="submit" name="view"><span class="fa fa-eye" aria-hidden="true"></span> {{ _('View') }}</a></li>

diff --git a/ckanext/querytool/templates/querytool/admin/snippets/query_tools.html b/ckanext/querytool/templates/querytool/admin/snippets/query_tools.html
@@ -14,7 +14,7 @@
 {% set delete_url = h.url_for('querytool_delete', querytool='/' + querytool.name) %}
 {% set user_type = h.get_user_permission_type(c.userobj, querytool.group) %}
 
-{% if h.get_groups_for_user(c.userobj, querytool.group) and ((user_type == 'member' and querytool.private != True) or user_type == 'admin') %}
+{% if h.get_groups_for_user(c.userobj, querytool.group) and ((user_type == 'member' and querytool.private != True) or user_type == 'admin') or c.userobj.sysadmin %}
 <div class="applicaitons-box">
 
   <div class="thumb">
@@ -43,7 +43,7 @@ <h2>{{ querytool.title }}</h2>
     <ul class="buttons-group">
       {% set user_permission = h.get_groups_for_user(c.userobj, querytool.group) %}
 
-      {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' %}
+      {% if user_type in ['admin', 'editor'] or user_permission and user_type != 'member' or c.userobj.sysadmin %}
       <li><a class="btn btn-minimal" role="button" href="{{ edit_data_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit filters and data') }}</a></li>
       <li><a class="btn btn-minimal" role="button" href="{{ edit_visualizations_url}}" type="submit" name="edit"><span class="fa fa-pencil" aria-hidden="true"></span> {{ _('Edit visualizations') }}</a></li>
       <li><a class="btn btn-minimal" role="button" href="{{ h.url_for('querytool_public_read', name=querytool.name) }}" type="submit" name="view"><span class="fa fa-eye" aria-hidden="true"></span> {{ _('View') }}</a></li>