Merge branch 'master' of git.rackster.ch:ipynbsrv/ipynbsrv

coco-project · Aug 6, 2015 · ce3146b · ce3146b
2 parents 5cc44f0 + d2ceefb
commit ce3146b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/ipynbsrv/core/models.py b/ipynbsrv/core/models.py
@@ -365,7 +365,8 @@ def get_managers(self):
         """
         managers = self.admins.all()
         if self.creator:
-            managers.append(self.creator)
+            if not self.is_admin(self.creator):
+                managers.append(self.creator)
         return managers
 
     def get_members(self):
@@ -376,7 +377,7 @@ def get_members(self):
         members = admins + self.get_users()
         if self.creator:
             members.append(self.creator)
-        return set(members)
+        return list(set(members))
 
     def get_users(self):
         """