PLAT-165: make read-only permissions as default, fix permissions stri…

…ng representation
buildlyio · Apr 1, 2019 · 6c078be · 6c078be
1 parent fbe964b
commit 6c078be
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/workflow/migrations/0002_auto_20190328_1231.py b/workflow/migrations/0002_auto_20190328_1231.py
@@ -46,7 +46,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='coregroup',
             name='permissions',
-            field=models.PositiveSmallIntegerField(default=15, help_text='Decimal integer from 0 to 15 converted from 4-bit binary, each bit indicates permissions for CRUD', verbose_name='Permissions'),
+            field=models.PositiveSmallIntegerField(default=4, help_text='Decimal integer from 0 to 15 converted from 4-bit binary, each bit indicates permissions for CRUD', verbose_name='Permissions'),
         ),
         migrations.AlterField(
             model_name='coreuser',

diff --git a/workflow/models.py b/workflow/models.py
@@ -265,7 +265,7 @@ class CoreGroup(models.Model):
     name = models.CharField('Name of the role', max_length=80)
     workflowlevel1 = models.ForeignKey(WorkflowLevel1, null=True, blank=True, on_delete=models.CASCADE)
     workflowlevel2 = models.ForeignKey(WorkflowLevel2, null=True, blank=True, on_delete=models.CASCADE)
-    permissions = models.PositiveSmallIntegerField('Permissions', default=15, help_text='Decimal integer from 0 to 15 converted from 4-bit binary, each bit indicates permissions for CRUD')
+    permissions = models.PositiveSmallIntegerField('Permissions', default=4, help_text='Decimal integer from 0 to 15 converted from 4-bit binary, each bit indicates permissions for CRUD')
     create_date = models.DateTimeField(default=timezone.now)
     edit_date = models.DateTimeField(null=True, blank=True)
 
@@ -292,7 +292,7 @@ def organization(self) -> Union[Organization, None]:
 
     @property
     def display_permissions(self) -> str:
-        return '{0:b}'.format(self.permissions if self.permissions < 16 else 15)
+        return '{0:04b}'.format(self.permissions if self.permissions < 16 else 15)
 
 
 class WorkflowTeam(models.Model):

diff --git a/workflow/tests/test_coregroupmodel.py b/workflow/tests/test_coregroupmodel.py
@@ -35,7 +35,8 @@ def test_coregroup_with_no_wfl():
 def test_coregroup_display_permissions():
     for i in range(16):
         coregroup = factories.CoreGroup.create(permissions=i)
-        assert coregroup.display_permissions == f'{i:b}'
+        assert len(coregroup.display_permissions) == 4
+        assert coregroup.display_permissions == f'{i:04b}'
 
     coregroup = factories.CoreGroup.create(permissions=20)
     assert coregroup.display_permissions == '1111'
diff --git a/workflow/tests/test_coregroupview.py b/workflow/tests/test_coregroupview.py
@@ -113,7 +113,7 @@ def test_coregroup_create_min(self, request_factory, org_admin):
         assert response.status_code == 201
         coregroup = wfm.CoreGroup.objects.get(name='New Group')
         assert coregroup.organization is None
-        assert coregroup.permissions == 15  # check default permissions
+        assert coregroup.permissions == 4  # check default permissions
 
     def test_coregroup_create_with_workfllow1(self, request_factory, org_admin):
         wfl1 = factories.WorkflowLevel1.create(organization=org_admin.organization)