summaryrefslogtreecommitdiff
path: root/yaksh/forms.py
diff options
context:
space:
mode:
authoradityacp2017-04-27 15:29:09 +0530
committeradityacp2017-04-27 15:29:09 +0530
commit82e30d89fb1814d12a1ee40a0f1b81e164f0ed85 (patch)
tree39fe6b90c12cbb9ad5dfd12f273ec55844146757 /yaksh/forms.py
parent966fd7f33c67b9d20e42c35bd3825119e3ba066f (diff)
downloadonline_test-82e30d89fb1814d12a1ee40a0f1b81e164f0ed85.tar.gz
online_test-82e30d89fb1814d12a1ee40a0f1b81e164f0ed85.tar.bz2
online_test-82e30d89fb1814d12a1ee40a0f1b81e164f0ed85.zip
Changes in email_verification.py, views.py, forms.py
- Updation of user email if multiple users found with same email - Update user registration form - Change email_verification.py to send email
Diffstat (limited to 'yaksh/forms.py')
-rw-r--r--yaksh/forms.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/yaksh/forms.py b/yaksh/forms.py
index ac4e1b0..b34ad59 100644
--- a/yaksh/forms.py
+++ b/yaksh/forms.py
@@ -144,8 +144,6 @@ class UserRegisterForm(forms.Form):
new_profile.timezone = cleaned_data["timezone"]
if settings.IS_DEVELOPMENT:
new_profile.is_email_verified = True
- new_profile.save()
- return u_name, pwd
else:
new_profile.activation_key = generate_activation_key(new_user.username)
new_profile.key_expiry_time = datetime.datetime.strftime(
@@ -154,7 +152,7 @@ class UserRegisterForm(forms.Form):
"%Y-%m-%d %H:%M:%S"
)
new_profile.save()
- return new_user.email, new_profile.activation_key
+ return u_name, pwd, new_user.email, new_profile.activation_key
class UserLoginForm(forms.Form):