From 82e30d89fb1814d12a1ee40a0f1b81e164f0ed85 Mon Sep 17 00:00:00 2001
From: adityacp
Date: Thu, 27 Apr 2017 15:29:09 +0530
Subject: 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

---
 yaksh/forms.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'yaksh/forms.py')

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):
-- 
cgit