summaryrefslogtreecommitdiff
path: root/yaksh
diff options
context:
space:
mode:
authorPrabhu Ramachandran2017-11-03 18:52:38 +0530
committerGitHub2017-11-03 18:52:38 +0530
commit6b8ecc840698b7793c1d8fd350da8c85f1b02b7d (patch)
treebdc30451cb826281e6d346321c56c57f549a6dff /yaksh
parent840c00b9e939d2b33058d236ef4170923e0a018b (diff)
parent3ab5cf0783159aab349ef69db7500a42ad2e719c (diff)
downloadonline_test-6b8ecc840698b7793c1d8fd350da8c85f1b02b7d.tar.gz
online_test-6b8ecc840698b7793c1d8fd350da8c85f1b02b7d.tar.bz2
online_test-6b8ecc840698b7793c1d8fd350da8c85f1b02b7d.zip
Merge pull request #375 from prathamesh920/edit_profile_bug_fix
Edit Profile Bug Fix
Diffstat (limited to 'yaksh')
-rw-r--r--yaksh/test_views.py32
-rw-r--r--yaksh/views.py6
2 files changed, 36 insertions, 2 deletions
diff --git a/yaksh/test_views.py b/yaksh/test_views.py
index dc06126..0950785 100644
--- a/yaksh/test_views.py
+++ b/yaksh/test_views.py
@@ -196,6 +196,38 @@ class TestProfile(TestCase):
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed(response, 'yaksh/profile_updated.html')
+ def test_edit_profile_post_for_user_without_profile(self):
+ """
+ POST request to edit_profile view should update the user's profile
+ """
+ self.client.login(
+ username=self.user1.username,
+ password=self.user1_plaintext_pass
+ )
+ response = self.client.post(reverse('yaksh:edit_profile'),
+ data={
+ 'user': self.user1,
+ 'first_name': 'new_first_name',
+ 'last_name': 'new_last_name',
+ 'roll_number': 21,
+ 'institute': 'new_institute',
+ 'department': 'Aerospace',
+ 'position': 'new_position',
+ 'timezone': 'UTC'
+ }
+ )
+ updated_profile_user = User.objects.get(id=self.user1.id)
+ updated_profile = Profile.objects.get(user=updated_profile_user)
+ self.assertEqual(updated_profile_user.first_name, 'new_first_name')
+ self.assertEqual(updated_profile_user.last_name, 'new_last_name')
+ self.assertEqual(updated_profile.roll_number, '21')
+ self.assertEqual(updated_profile.institute, 'new_institute')
+ self.assertEqual(updated_profile.department, 'Aerospace')
+ self.assertEqual(updated_profile.position, 'new_position')
+
+ self.assertEqual(response.status_code, 200)
+ self.assertTemplateUsed(response, 'yaksh/profile_updated.html')
+
def test_edit_profile_get(self):
"""
GET request to edit profile should display profile form
diff --git a/yaksh/views.py b/yaksh/views.py
index b4cb844..c50ba33 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -1406,7 +1406,6 @@ def view_profile(request):
@login_required
-@has_profile
@email_verified
def edit_profile(request):
""" edit profile details facility for moderator and students """
@@ -1418,7 +1417,10 @@ def edit_profile(request):
else:
template = 'user.html'
context = {'template': template}
- profile = Profile.objects.get(user_id=user.id)
+ try:
+ profile = Profile.objects.get(user_id=user.id)
+ except Profile.DoesNotExist:
+ profile = None
if request.method == 'POST':
form = ProfileForm(request.POST, user=user, instance=profile)