Allow project export for managers

rdmorganiser · Dec 10, 2020 · b08d421 · b08d421
1 parent edea760
commit b08d421
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@
 * Fix a bug with the import of option sets
 * Fix a bug with RDF exports
 * Allow anonymous users to see the terms of use
+* Allow project export for managers
 * Update Italian translation
 
 ## RDMO 1.3 (Oct 6, 2020)

diff --git a/rdmo/projects/rules.py b/rdmo/projects/rules.py
@@ -37,7 +37,7 @@ def is_site_manager(user, project):
 rules.add_perm('projects.view_project_object', is_project_member | is_site_manager)
 rules.add_perm('projects.change_project_object', is_project_manager | is_project_owner | is_site_manager)
 rules.add_perm('projects.delete_project_object', is_project_owner | is_site_manager)
-rules.add_perm('projects.export_project_object', is_project_owner | is_site_manager)
+rules.add_perm('projects.export_project_object', is_project_owner | is_project_manager | is_site_manager)
 rules.add_perm('projects.import_project_object', is_project_owner | is_project_manager | is_site_manager)
 
 rules.add_perm('projects.view_membership_object', is_project_member | is_site_manager)

diff --git a/rdmo/projects/templates/projects/project_detail_sidebar.html b/rdmo/projects/templates/projects/project_detail_sidebar.html
@@ -79,9 +79,7 @@ <h2>{% trans 'Options' %}</h2>
 </ul>
 
 {% has_perm 'projects.export_project_object' request.user project as can_export_project %}
-{% if can_add_membership %}
-
-{% if settings.PROJECT_EXPORTS %}
+{% if settings.PROJECT_EXPORTS and can_export_project %}
 <h2>{% trans 'Export' %}</h2>
 
 <ul class="list-unstyled">
@@ -95,8 +93,8 @@ <h2>{% trans 'Export' %}</h2>
 </ul>
 {% endif %}
 
-{% if settings.PROJECT_IMPORTS %}
-
+{% has_perm 'projects.export_project_object' request.user project as can_export_project %}
+{% if settings.PROJECT_IMPORTS and can_export_project %}
 <h2>{% trans 'Import values from file' %}</h2>
 
 <ul class="list-unstyled">
@@ -105,6 +103,4 @@ <h2>{% trans 'Import values from file' %}</h2>
         {% include 'core/upload_form.html' with upload_url=upload_url %}
     </li>
 </ul>
-
-{% endif %}
 {% endif %}
diff --git a/rdmo/projects/tests/test_view_project.py b/rdmo/projects/tests/test_view_project.py
@@ -2,6 +2,7 @@
 
 import pytest
 from django.urls import reverse
+
 from rdmo.views.models import View
 
 from ..models import Project
@@ -45,7 +46,7 @@
         'owner': 302, 'manager': 403, 'author': 403, 'guest': 403, 'user': 403, 'site': 302, 'anonymous': 302
     },
     'export': {
-        'owner': 200, 'manager': 403, 'author': 403, 'guest': 403, 'user': 403, 'site': 200, 'anonymous': 302
+        'owner': 200, 'manager': 200, 'author': 403, 'guest': 403, 'user': 403, 'site': 200, 'anonymous': 302
     }
 }