Merge branch 'release/0.1.13'

clinicedc · Nov 12, 2018 · 048b2fc · 048b2fc
2 parents 58f14af + 6fe1b88
commit 048b2fc
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 5 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.1.12
+0.1.13
diff --git a/edc_permissions/constants/__init__.py b/edc_permissions/constants/__init__.py
@@ -2,7 +2,7 @@
 from .group_names import (
     ACCOUNT_MANAGER, ADMINISTRATION, PII_VIEW,
     EVERYONE, AUDITOR, CLINIC, LAB, PHARMACY, PII,
-    EXPORT)
+    EXPORT, DATA_MANAGER)
 from .lab_dashboard_codenames import LAB_DASHBOARD_CODENAMES
 
 DEFAULT_AUDITOR_APP_LABELS = ['edc_lab', 'edc_offstudy']
@@ -12,6 +12,7 @@
     ADMINISTRATION,
     AUDITOR,
     CLINIC,
+    DATA_MANAGER,
     EVERYONE,
     EXPORT,
     LAB,

diff --git a/edc_permissions/constants/default_codenames.py b/edc_permissions/constants/default_codenames.py
@@ -1,7 +1,7 @@
 from .group_names import (
     ACCOUNT_MANAGER, ADMINISTRATION, PII_VIEW,
     EVERYONE, AUDITOR, CLINIC, LAB, PHARMACY, PII,
-    EXPORT)
+    EXPORT, DATA_MANAGER)
 
 DEFAULT_CODENAMES = {
     ACCOUNT_MANAGER: [
@@ -93,6 +93,15 @@
         'view_reference',
         'view_subjectoffstudy',
     ],
+    DATA_MANAGER: [
+        'add_crfmetadata',
+        'add_requisitionmetadata',
+        'change_crfmetadata',
+        'change_requisitionmetadata',
+        'delete_crfmetadata',
+        'delete_requisitionmetadata',
+        'view_crfmetadata',
+        'view_requisitionmetadata'],
     EVERYONE: [
         'view_group',
         'view_logentry',

diff --git a/edc_permissions/constants/group_names.py b/edc_permissions/constants/group_names.py
@@ -2,6 +2,7 @@
 ADMINISTRATION = 'ADMINISTRATION'
 AUDITOR = 'AUDITOR'
 CLINIC = 'CLINIC'
+DATA_MANAGER = 'DATA_MANAGER'
 EVERYONE = 'EVERYONE'
 EXPORT = 'EXPORT'
 LAB = 'LAB'

diff --git a/edc_permissions/permissions_updater.py b/edc_permissions/permissions_updater.py
@@ -9,12 +9,11 @@
 from edc_navbar.site_navbars import site_navbars
 
 from .constants import (
-    ACCOUNT_MANAGER, ADMINISTRATION, EXPORT,
+    ACCOUNT_MANAGER, ADMINISTRATION, EXPORT, DATA_MANAGER,
     EVERYONE, AUDITOR, CLINIC, LAB, PHARMACY, PII, PII_VIEW,
     DEFAULT_GROUP_NAMES, DEFAULT_PII_MODELS,
     DEFAULT_AUDITOR_APP_LABELS, LAB_DASHBOARD_CODENAMES)
 
-
 DUPLICATE_CODENAME = 'duplicate_codename'
 
 
@@ -414,6 +413,14 @@ def update_administration_group_permissions(self):
         self.add_navbar_permissions(
             group, codenames=self.navbar_codenames.get(ADMINISTRATION))
 
+    def update_data_manager_group_permissions(self):
+        group_name = DATA_MANAGER
+        group = Group.objects.get(name=group_name)
+        group.permissions.clear()
+        for permission in Permission.objects.filter(
+                content_type__app_label__in=['edc_metadata', ]):
+            group.permissions.add(permission)
+
     def add_pii_permissions(self, group, view_only=None):
         """Adds PII model permissions.
         """