a handful of small fixes for merge !7

coco-project · Aug 6, 2015 · 8843df1 · 8843df1
1 parent f76727d
commit 8843df1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/ipynbsrv/admin/forms.py b/ipynbsrv/admin/forms.py
@@ -45,11 +45,11 @@ def save(self, commit=True):
             for admin in self.cleaned_data['admins']:
                 group.add_admin(admin)
             # users
-            for user in group.get_members():
+            for user in group.get_users():
                 if user not in self.cleaned_data['users']:
-                    group.remove_member(user)
+                    group.remove_user(user)
             for user in self.cleaned_data['users']:
-                group.add_member(user)
+                group.add_user(user)
         else:
             old_save_m2m = self.save_m2m
 
@@ -62,11 +62,11 @@ def new_save_m2m():
                 for admin in self.cleaned_data['admins']:
                     group.add_admin(admin)
                 # users
-                for user in group.get_members():
+                for user in group.get_users():
                     if user not in self.cleaned_data['users']:
-                        group.remove_member(user)
+                        group.remove_user(user)
                 for user in self.cleaned_data['users']:
-                    group.add_member(user)
+                    group.add_user(user)
             self.save_m2m = new_save_m2m
         return group
 

diff --git a/ipynbsrv/core/signals/shares.py b/ipynbsrv/core/signals/shares.py
@@ -91,16 +91,16 @@ def remove_group_members_from_share_group(sender, share, group, **kwargs):
     if share is not None and group is not None:
         for member in group.get_members():
             leave = False
-            if user == share.owner:
+            if member == share.owner:
                 leave = True
             else:
                 for access_group in share.access_groups.all():
                     if access_group != group:
-                        if access_group.has_access(user):
+                        if access_group.has_access(member):
                             leave = True
                             break
             if not leave:
-                share.remove_member(user)
+                share.remove_member(member)
 
 
 @receiver(collaboration_group_member_removed)