Commit 86b676a1 authored by Ivan Tyagov's avatar Ivan Tyagov

Do not raise traceback if user activates more than once his user account,

instead show more friendlier message.
parent bd88ed85
...@@ -55,11 +55,13 @@ ...@@ -55,11 +55,13 @@
mail_message = portal.portal_catalog.getResultValue(portal_type="Mail Message", reference=key)\n mail_message = portal.portal_catalog.getResultValue(portal_type="Mail Message", reference=key)\n
\n \n
credential_request = mail_message.getFollowUpValue()\n credential_request = mail_message.getFollowUpValue()\n
if credential_request.getValidationState() in (\'submitted\', \'accepted\'):\n
message = "Your account is already active."\n
else:\n
credential_request.submit(comment=\'Create by subscription form\')\n
mail_message.deliver()\n
message = "Your account is being activated. You will receive one e-mail after finish the activation"\n
\n \n
credential_request.submit(comment=\'Create by subscription form\')\n
\n
mail_message.deliver()\n
message = "Your account is being activated. You will receive one e-mail after finish the activation"\n
return context.Base_redirect("login_form?portal_status_message=%s" % message)\n return context.Base_redirect("login_form?portal_status_message=%s" % message)\n
</string> </value> </string> </value>
</item> </item>
......
407 408
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment