finalisation de la structure des tests pour group_invitation et group…

…_member, ajout de certains cas non traités auparavant dans les models/views
ProjetSigma · Dec 4, 2016 · b212ce4 · b212ce4
1 parent 47fdf0b
commit b212ce4
Show file tree

Hide file tree

Showing 7 changed files with 327 additions and 304 deletions.
diff --git a/sigma_core/models/group.py b/sigma_core/models/group.py
@@ -19,7 +19,7 @@ class Group(models.Model):
     name = models.CharField(max_length=254)
     description = models.TextField(blank=True)
     is_protected = models.BooleanField(default=False) # if True, the Group cannot be deleted
-    can_anyone_ask = models.BooleanField(default=False) #if True, people don't need invitation to ask to join
+    can_anyone_ask = models.BooleanField(default=True) #if True, people don't need invitation to ask to join
     need_validation_to_join = models.BooleanField(default=False) #if True, people from the group who can invite need to accept the asker
 
     """ Set the confidentiality of the group's members

diff --git a/sigma_core/models/group_member.py b/sigma_core/models/group_member.py
@@ -133,9 +133,9 @@ def has_object_update_permission(self, request):
                         return False
 
             if (serializer.is_administrator != self.is_administrator or \
-            serializer.is_super_administrator != self.is_super_administrator) and not mb.is_super_administrator:
+            serializer.is_super_administrator != self.is_super_administrator) and \
+            (not mb.is_super_administrator or (mb_is_super_administrator and self==mb)):
                 return False
-
             return True
 
         except GroupMember.DoesNotExist:

diff --git a/sigma_core/tests/test_cluster.py b/sigma_core/tests/test_cluster.py