--- a/opensourceprojects/controllers.py
+++ b/opensourceprojects/controllers.py
@@ -61,7 +61,7 @@
return d
-form = OSPRegistrationForm(action='/auth2/save_new', submit_text='Sign Up')
+form = OSPRegistrationForm(action='/auth/save_new', submit_text='Sign Up')
class OSPAuthController(AuthController):
"""
@@ -109,7 +109,7 @@
If you did not request this account, please ignore this email.
-''' % (email.claimed_by_user().username, g.url('/auth2/verify_acct', a=email.nonce), passwd)
+''' % (email.claimed_by_user().username, g.url('/auth/verify_acct', a=email.nonce), passwd)
allura.tasks.mail_tasks.sendmail.post(
destinations=[email._id],
@@ -119,7 +119,7 @@
message_id=h.gen_message_id(),
text=text)
- @expose('jinja:opensourceprojects:templates/verify_acct.html')
+ @expose()
def verify_acct(self, a):
"""
Verify an account using an email token
@@ -130,9 +130,11 @@
redirect('/')
addr.confirmed = True
+ addr.nonce = ''
user = addr.claimed_by_user()
user.disabled = False
- return dict(username=user.username)
+ flash('User "%s" confirmed, you can now login into your account' % user.username)
+ redirect('/')
@staticmethod
def random_pass(size=8, chars=string.ascii_letters + string.digits):
@@ -159,8 +161,7 @@
* A new front page
"""
-# auth = OSPAuthController()
- auth2 = OSPAuthController()
+ auth = OSPAuthController()
@expose('jinja:opensourceprojects:templates/about.html')
def about(self):
@@ -169,7 +170,7 @@
@expose('jinja:opensourceprojects:templates/frontpage.html')
@with_trailing_slash
def index(self, **kw):
- return dict(form=OSPRegistrationForm(submit_text='Sign Up now!', action='/auth2/save_new'))
+ return dict(form=OSPRegistrationForm(submit_text='Sign Up now!', action='/auth/save_new'))