equal
deleted
inserted
replaced
31 password = request.POST['password'] |
31 password = request.POST['password'] |
32 user = authenticate(username=username, password=password) |
32 user = authenticate(username=username, password=password) |
33 if user is not None: |
33 if user is not None: |
34 if user.is_active: |
34 if user.is_active: |
35 login(request, user) |
35 login(request, user) |
36 return HttpResponseRedirect('/proposal/submit/') |
36 if user.is_staff: |
|
37 return HttpResponseRedirect('/proposal/review/') |
|
38 else: |
|
39 return HttpResponseRedirect('/proposal/submit/') |
37 else: |
40 else: |
38 pass |
41 pass |
39 # Return a 'disabled account' error message |
42 # Return a 'disabled account' error message |
40 else: |
43 else: |
41 # Return an 'invalid login' error message. |
44 # Return an 'invalid login' error message. |
55 try: |
58 try: |
56 user = User.objects.create_user(username, username, password) |
59 user = User.objects.create_user(username, username, password) |
57 user.save() |
60 user.save() |
58 subject = "[Sakshath] Registration at Saskshath portal" |
61 subject = "[Sakshath] Registration at Saskshath portal" |
59 message = """Hi, |
62 message = """Hi, |
60 We have received a request for registration of your |
63 We have received a request for registration of your email address, |
61 email address, "%s", to the http://sakshath.ac.in mailing list. |
64 "%s", to the http://sakshath.ac.in portal. |
62 \n\n |
65 |
63 Your login credentials are:\n |
66 Your login credentials are: |
64 username: %s\n |
67 username: %s |
65 password: %s\n\n\n |
68 password: %s |
66 Regards, |
69 |
67 Saksath admin |
70 -- |
68 """ % (username, username, password) |
71 Regards, |
|
72 Saksath admin""" % (username, username, password) |
69 |
73 |
70 user.email_user(subject=subject, message=message) |
74 user.email_user(subject=subject, message=message) |
|
75 |
71 context = { |
76 context = { |
72 'created': True, |
77 'created': True, |
73 'username': username, |
78 'username': username, |
74 } |
79 } |
75 except IntegrityError: |
80 except IntegrityError: |