Makes the guided registration stay on the front page if an incorrect voucher is added but a valid profile is filled out. Resolves #9
This commit is contained in:
		
							parent
							
								
									01b9adbaf4
								
							
						
					
					
						commit
						97438624e1
					
				
					 1 changed files with 15 additions and 3 deletions
				
			
		|  | @ -53,6 +53,8 @@ def guided_registration(request, page_id=0): | ||||||
|     ''' |     ''' | ||||||
| 
 | 
 | ||||||
|     SESSION_KEY = "guided_registration_categories" |     SESSION_KEY = "guided_registration_categories" | ||||||
|  |     ASK_FOR_PROFILE = 777  # Magic number. Meh. | ||||||
|  | 
 | ||||||
|     next_step = redirect("guided_registration") |     next_step = redirect("guided_registration") | ||||||
| 
 | 
 | ||||||
|     sections = [] |     sections = [] | ||||||
|  | @ -72,9 +74,19 @@ def guided_registration(request, page_id=0): | ||||||
|     except ObjectDoesNotExist: |     except ObjectDoesNotExist: | ||||||
|         profile = None |         profile = None | ||||||
| 
 | 
 | ||||||
|     if not profile: |     # Figure out if we need to show the profile form and the voucher form | ||||||
|         # TODO: if voucherform is invalid, make sure |     show_profile_and_voucher = False | ||||||
|         # that profileform does not save |     if SESSION_KEY not in request.session: | ||||||
|  |         if not profile: | ||||||
|  |             show_profile_and_voucher = True | ||||||
|  |     else: | ||||||
|  |         if request.session[SESSION_KEY] == ASK_FOR_PROFILE: | ||||||
|  |             show_profile_and_voucher = True | ||||||
|  | 
 | ||||||
|  |     if show_profile_and_voucher: | ||||||
|  |         # Keep asking for the profile until everything passes. | ||||||
|  |         request.session[SESSION_KEY] = ASK_FOR_PROFILE | ||||||
|  | 
 | ||||||
|         voucher_form, voucher_handled = handle_voucher(request, "voucher") |         voucher_form, voucher_handled = handle_voucher(request, "voucher") | ||||||
|         profile_form, profile_handled = handle_profile(request, "profile") |         profile_form, profile_handled = handle_profile(request, "profile") | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		
		Reference in a new issue
	
	 Christopher Neugebauer
						Christopher Neugebauer