Adds the option to enable/disable email digests and makes small tweak on the handling...

git-svn-id: http://svn.osqa.net/svnroot/osqa/trunk@484 0cfe37f9-358a-4d5e-be75-b63607b5c754

diff --git a/forum/skins/default/templates/users/subscriptions.html b/forum/skins/default/templates/users/subscriptions.html
index a27c0feec6a71db7a5028b530e587953079fa0db..dcbea98dc006e728004d135a580353ba219f8b50 100644 (file)
--- a/forum/skins/default/templates/users/subscriptions.html
+++ b/forum/skins/default/templates/users/subscriptions.html
@@ -22,6 +22,7 @@
     </p>\r
     <div class='inline-block'>\r
     <form method="POST">\r
     </p>\r
     <div class='inline-block'>\r
     <form method="POST">\r

+        {{ form.errors }}\r

         <table class="form-as-table">\r
             <tr>\r
                 <td colspan="2">\r
         <table class="form-as-table">\r
             <tr>\r
                 <td colspan="2">\r

diff --git a/forum/views/users.py b/forum/views/users.py
index bf105c964cb50c5a390bb5b2d30353d8cc13ff50..43464d80dd5a4de035f2c107f7cdec2a3eeae562 100644 (file)
--- a/forum/views/users.py
+++ b/forum/views/users.py
@@ -305,8 +305,6 @@ def user_subscriptions(request, user):
 \r
             form.save()\r
             request.user.message_set.create(message=_('New subscription settings are now saved'))\r
 \r
             form.save()\r
             request.user.message_set.create(message=_('New subscription settings are now saved'))\r

-        else:\r
-            print form.errors\r

     else:\r
         form = SubscriptionSettingsForm(instance=user.subscription_settings)\r
 \r
     else:\r
         form = SubscriptionSettingsForm(instance=user.subscription_settings)\r
 \r