# HG changeset patch # User Madhusudan.C.S # Date 1291114025 -19800 # Node ID 6963bc54d5c237a048a75c72ae9f7d208b151229 # Parent 1f227f3b70e417b447cd5633d745f3706069c062 Fix preceding accommodation which were stolen away by magic. diff -r 1f227f3b70e4 -r 6963bc54d5c2 project/scipycon/registration/forms.py --- a/project/scipycon/registration/forms.py Tue Nov 30 16:01:52 2010 +0530 +++ b/project/scipycon/registration/forms.py Tue Nov 30 16:17:05 2010 +0530 @@ -94,7 +94,6 @@ sex = self.cleaned_data['sex'] accommodation_required = self.cleaned_data['accommodation_required'] - accommodation_days = sum(filter([a1, a2, a3, a4, a5, a6])) a1 = self.cleaned_data['accommodation_on_1st'] a2 = self.cleaned_data['accommodation_on_2nd'] @@ -103,16 +102,18 @@ a5 = self.cleaned_data['accommodation_on_5th'] a6 = self.cleaned_data['accommodation_on_6th'] + accommodation_days = [a1, a2, a3, a4, a5, a6].count(True) + acco.sex = sex acco.accommodation_required = accommodation_required - acco.accommodation_days = _days + acco.accommodation_days = accommodation_days - acco._on_1st = a1 - acco._on_2nd = a2 - acco._on_3rd = a3 - acco._on_4th = a4 - acco._on_5th = a5 - acco._on_6th = a6 + acco.accommodation_on_1st = a1 + acco.accommodation_on_2nd = a2 + acco.accommodation_on_3rd = a3 + acco.accommodation_on_4th = a4 + acco.accommodation_on_5th = a5 + acco.accommodation_on_6th = a6 acco.save() @@ -129,12 +130,12 @@ sex = self.cleaned_data['sex'] accommodation_required = self.cleaned_data['accommodation_required'] - a1 = self.cleaned_data['_on_1st'] - a2 = self.cleaned_data['_on_2nd'] - a3 = self.cleaned_data['_on_3rd'] - a4 = self.cleaned_data['_on_4th'] - a5 = self.cleaned_data['_on_5th'] - a6 = self.cleaned_data['_on_6th'] + a1 = self.cleaned_data['accommodation_on_1st'] + a2 = self.cleaned_data['accommodation_on_2nd'] + a3 = self.cleaned_data['accommodation_on_3rd'] + a4 = self.cleaned_data['accommodation_on_4th'] + a5 = self.cleaned_data['accommodation_on_5th'] + a6 = self.cleaned_data['accommodation_on_6th'] selected_a_date = any([a1, a2, a3, a4, a5, a6]) @@ -150,12 +151,12 @@ model = Accommodation fields = ('accommodation_required', 'sex', - '_on_1st', - '_on_2nd', - '_on_3rd', - '_on_4th', - '_on_5th', - '_on_6th', + 'accommodation_on_1st', + 'accommodation_on_2nd', + 'accommodation_on_3rd', + 'accommodation_on_4th', + 'accommodation_on_5th', + 'accommodation_on_6th', ) diff -r 1f227f3b70e4 -r 6963bc54d5c2 project/scipycon/registration/views.py --- a/project/scipycon/registration/views.py Tue Nov 30 16:01:52 2010 +0530 +++ b/project/scipycon/registration/views.py Tue Nov 30 16:17:05 2010 +0530 @@ -139,7 +139,12 @@ 'scope': acco.scope, 'sex': acco.sex, 'accommodation_required': acco.accommodation_required, - 'accommodation_days': acco.accommodation_days, + 'accommodation_on_1st': acco.accommodation_on_1st, + 'accommodation_on_2nd': acco.accommodation_on_2nd, + 'accommodation_on_3rd': acco.accommodation_on_3rd, + 'accommodation_on_4th': acco.accommodation_on_4th, + 'accommodation_on_5th': acco.accommodation_on_5th, + 'accommodation_on_6th': acco.accommodation_on_6th, }) payment_form = PaymentForm(initial={ 'user': payment.user,