Changeset 6bbcc8 in indico

Timestamp:

05/26/11 14:17:50 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, 0da0c1403bae8e51d8229f460181c71b9e6dda72

Children:

6ed8c1

Parents:

c17e12

git-author:

Alberto Resco Perez <alberto.resco.perez@…> (04/27/11 15:21:35)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (05/26/11 14:17:50)

Message:

[FIX] Registration connect to avatar if not login

• If the user is not logged in and register with the same email, the user will be connected to his avatar.
• Closes task #742

File:

• indico/MaKaC/webinterface/rh/registrationFormDisplay.py (modified) (2 diffs)

indico/MaKaC/webinterface/rh/registrationFormDisplay.py

@@ -141 +141 @@
 
     def _process( self ):
-        user = self._getUser()
-        canManageRegistration = self._conf.canManageRegistration(user)
-        if not canManageRegistration and (not self._regForm.isActivated() or not self._conf.hasEnabledSection("regForm")):
+        canManageRegistration = self._conf.canManageRegistration(self._getUser())
+        if not canManageRegistration and not self._regForm.isActivated():
             p = registrationForm.WPRegFormInactive( self, self._conf )
             return p.display()
         params = self._getRequestParams()
-        if canManageRegistration:
-            matchedUsers = AvatarHolder().match({"email": params["email"]})
-            if matchedUsers:
-                user = matchedUsers[0]
-            else:
-                user = None
-        else:
+
+        matchedUsers = AvatarHolder().match({"email": params["email"]})
+        if matchedUsers:
+            user = matchedUsers[0]
+        else:
+            user = None
+        # Check if the user can register
+        if not canManageRegistration: # normal user registering. Managers can.
             if self._conf.getRegistrationForm().isFull():
                 self._redirect(urlHandlers.UHConfRegistrationFormDisplay.getURL(self._conf))
@@ -167 +167 @@
                 self._redirect(urlHandlers.UHConfRegistrationForm.getURL(self._conf))
                 return
-            if self._conf.hasRegistrantByEmail(self._getUser().getEmail()):
+            if self._conf.hasRegistrantByEmail(user.getEmail()):
                 raise FormValuesError("You have already registered with the email address \"%s\". If you need to modify your registration, please contact the managers of the conference."%self._getUser().getEmail())
         rp = registration.Registrant()