Changeset 97539e in indico

Timestamp:

01/28/11 16:11:35 (2 years ago)

Author:

Jose Benito <jose.benito.gonzalez@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

fced0f

Parents:

2e8d57

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (01/28/11 15:32:23)

git-committer:

Jose Benito <jose.benito.gonzalez@…> (01/28/11 16:11:35)

Message:

[IMP] Properly handle modifications with disabled sections

• If a section is disabled, modifying a registration will clear the values in the section's form

File:

• indico/MaKaC/registration.py (modified) (11 diffs)

indico/MaKaC/registration.py

@@ -126 +126 @@
         form.setActivated(self.isActivated())
         form.setMandatoryAccount(self.isMandatoryAccount())
-        form.setAllSessions()
         form.notification=self.getNotification().clone()
         form.personalData = self.getPersonalData().clone()
@@ -138 +137 @@
         if rpf is not None :
             form.reasonParticipationForm = rpf.clone()
+        form.setAllSessions()
         ses = self.getSessionsForm()
         if ses is not None :
@@ -769 +769 @@
         booking.append( _("""
 \tQuantity\t\tItem\t\tunit.price\t\tCost"""))
+        #All billable general fields
         for gsf in registrant.getMiscellaneousGroupList():
             miscGroup=registrant.getMiscellaneousGroupById(gsf.getId())
@@ -790 +791 @@
                         value=":%s"%value
                     if(quantity>0):
-                         booking.append("""%i\t\t%s : %s%s\t\t%s\t\t%s %s"""%(quantity,miscGroup.getTitle(),caption,value,price,price*quantity,currency) )
+                        booking.append("""%i\t\t%s : %s%s\t\t%s\t\t%s %s"""%(quantity,miscGroup.getTitle(),caption,value,price,price*quantity,currency) )
+        #All billable standard fields (accommodation, sessions, social events)
         for bf in registrant.getBilledForms():
             for item in bf.getBilledItems():
@@ -4064 +4066 @@
             self.setReasonParticipation(data.get("reason",""))
 
+
         if self.getRegistrationForm().getSessionsForm().isEnabled():
-            sessions=data.get("sessions",[])
+            sessions = data.get("sessions", [])
             if not isinstance(sessions, list):
                 sessions = [ sessions ]
@@ -4076 +4079 @@
                 newSessions += [session for session in sessions if not session.isBillable()]
                 self.setSessions(newSessions)
+        else:
+            self.setSessions([])
 
         if self.getRegistrationForm().getAccommodationForm().isEnabled():
@@ -4091 +4096 @@
                 if ad > dd:
                     raise FormValuesError( _("Arrival date has to be earlier than departure date"))
-            if self.getRegistrationForm().getAccommodationForm().getAccommodationTypesList() !=[] and data.get("accommodationType",None) is None:
-                raise FormValuesError( _("It is mandatory to choose an accommodation in order to register"))
             # Allow changing of the dates only if the current accomodation is not billable or the user hasn't paid yet
             currentAccoType = self._accommodation.getAccommodationType()
@@ -4108 +4111 @@
                     ((currentAccoType is None or not currentAccoType.isBillable()) and \
                      (accoType is None or not accoType.isBillable())):
+                    if self.getRegistrationForm().getAccommodationForm().getAccommodationTypesList() !=[] and data.get("accommodationType",None) is None:
+                        raise FormValuesError( _("It is mandatory to choose an accommodation in order to register"))
                     self._accommodation.setAccommodationType(accoType)
+        else: # AccommodationForm disabled
+            self._accommodation.setAccommodationType(None)
 
         if self.getRegistrationForm().getSocialEventForm().isEnabled():
@@ -4120 +4127 @@
                     newSE = SocialEvent(seItem, int(data.get("places-%s"%seItem.getId(), "1")))
                     self.addSocialEvent(newSE)
+        else:
+            for seItem in self.getSocialEvents()[:]:
+                self.removeSocialEventById(seItem.getId())
         #if not self.getPayed():
         #    self._miscellaneous = {}
@@ -4439 +4449 @@
 
     def getBilledForms(self):
+        """
+
+        """
         forms = []
         if self._accommodation:
@@ -4572 +4585 @@
             if at is not None:
                 at.increaseNoPlaces()
+                self._price = at.getPrice()
+                self._billable = at.isBillable()
+                self._currency = at.getCurrency()
+            else:
+                self._price = 0
+                self._billable = False
+                self._currency = ""
             self._accommodationType = at
-            self._price = at.getPrice()
-            self._billable = at.isBillable()
-            self._currency = at.getCurrency()
 
 class SocialEvent(Persistent):