Changeset 0819c2 in indico for indico/MaKaC/services/implementation/conference.py

Timestamp:

01/12/12 15:34:55 (17 months ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 00b052b1a13a63c5c79db7f3ad310f643651dc50

Children:

8cf945c

Parents:

7910eb

git-author:

Pedro Ferreira <jose.pedro.ferreira@…> (08/16/11 11:01:04)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/12/12 15:34:55)

Message:

[FIX] Several rebasing issues, user searches

• Forced local user searches (faster);
• Used canModify() to check event management permission;

File:

• indico/MaKaC/services/implementation/conference.py (modified) (2 diffs)

indico/MaKaC/services/implementation/conference.py

@@ -994 +994 @@
         #If the chairperson needs to be given management rights
         if self._userData.get("manager", None):
-            avl = AvatarHolder().match({"email": self._userData.get("email", "")})
+            avl = AvatarHolder().match({"email": self._userData.get("email", "")},
+                                       forceWithoutExtAuth=True, exact=True)
             if avl:
                 av = avl[0]
@@ -1017 +1018 @@
     def _getAnswer(self):
         chair = self._conf.getChairById(self._chairId)
-        # var to control if we have to show the checkbox to allow add to modification control list
-        canModify = True
-        av = AvatarHolder().match({"email": chair.getEmail()})
-        if (not av or not av[0] in self._conf.getManagerList()) and not chair.getEmail() in self._conf.getAccessController().getModificationEmail():
-            canModify = False
         result = fossilize(chair)
-        result["canModify"] = canModify
+
+        av = AvatarHolder().match({"email": chair.getEmail()},
+                                  forceWithoutExtAuth=True, exact=True)
+        result['canModify'] = self._conf.getAccessController().canModify(av[0]) if av else False
         return result