Changeset 4aefab in indico

Timestamp:

05/11/12 17:48:28 (12 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

96cf0c

Parents:

610ce4

git-author:

Jose Benito <jose.benito.gonzalez@…> (05/10/12 15:14:08)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (05/11/12 17:48:28)

Message:

[IMP] Grant submission rights better perf

Location:

indico/MaKaC

Files:

• conference.py (modified) (1 diff)
• user.py (modified) (2 diffs)

indico/MaKaC/conference.py

@@ -9465 +9465 @@
         if isinstance(sb, ContributionParticipation) or isinstance(sb, SubContribParticipation):
             ah = AvatarHolder()
-            results=ah.match({"email":sb.getEmail()}, exact=1)
+            results=ah.match({"email":sb.getEmail()}, exact=1, forceWithoutExtAuth=True)
+            if not results:
+                results=ah.match({"email":sb.getEmail()}, exact=1)
             r=None
             for i in results:

indico/MaKaC/user.py

@@ -1539 +1539 @@
                 if not authId == "Local":
                     dict = euh.getById(authId).match(criteria, exact=exact)
-                    if authId == "Nice":
-                        auth = NiceAuthentication.NiceAuthenticator()
-                    elif authId == "LDAP":
-                        auth = LDAPAuthentication.LDAPAuthenticator()
-                    else:
-                       raise MaKaCError(
-                           _("Authentication type " + authId + " is not known."))
                     for email in dict.iterkeys():
                         # TODO and TOSTUDY: result.keys should be replace it with
@@ -1558 +1551 @@
                                     # TODO: check if same can happen with emails
                                     # if auth.hasKey(dict[email]["login"]):
-                                      # av = auth.getById(dict[email]["login"]).getUser()
+                                    #     av = auth.getById(dict[email]["login"]).getUser()
                                     result[email] = av
                             else: