equal
deleted
inserted
replaced
87 profession=data['profession'], |
87 profession=data['profession'], |
88 affiliated_to=data['affiliated_to'], |
88 affiliated_to=data['affiliated_to'], |
89 interests=data['interests'] |
89 interests=data['interests'] |
90 ) |
90 ) |
91 |
91 |
92 reg_events.send_activation(new_user) |
|
93 if event: |
92 if event: |
94 event.attendees.add(new_user) |
93 event.attendees.add(new_user) |
95 event.save() |
94 event.save() |
96 |
95 reg_events.send_activation(new_user) |
97 return redirect('/reg/account_created') |
96 return redirect('/reg/account_created') |
98 else: |
97 else: |
99 return render_to_response('register.html', {'form':form, 'event':event}) |
98 return render_to_response('register.html', {'form':form, 'event':event}) |
100 else: |
99 else: |
101 form = reg_forms.RegisterForm() |
100 form = reg_forms.RegisterForm() |
112 """ see if the key exists. |
111 """ see if the key exists. |
113 see if the corresponding user is inactive. |
112 see if the corresponding user is inactive. |
114 """ |
113 """ |
115 |
114 |
116 user = request.user |
115 user = request.user |
117 if user.is_authenticated(): |
116 if user.is_authenticated() and user.is_active: |
118 return redirect('/reg') |
117 return redirect('/reg') |
119 |
118 |
120 try: |
119 try: |
121 profile = Profile.objects.get(activation_key__iexact=activation_key) |
120 profile = Profile.objects.get(activation_key__iexact=activation_key) |
122 except Profile.DoesNotExist: |
121 except Profile.DoesNotExist: |