merge notification-config -> trunk, previous commits 694, 695, 702

[osqa.git] / forum / views / admin.py

diff --git a/forum/views/admin.py b/forum/views/admin.py
index 40a098a3b470ff62938b7b8d1aaf49c342fab442..4b07915b1ff3a62777c39c333c958dd303f859eb 100644 (file)
--- a/forum/views/admin.py
+++ b/forum/views/admin.py
@@ -13,6 +13,7 @@ from forum.settings.base import Setting
 from forum.forms import MaintenanceModeForm, PageForm, CreateUserForm
 from forum.settings.forms import SettingsSetForm
 from forum.utils import pagination, html
+from forum.utils.mail import send_template_email
 
 from forum.models import Question, Answer, User, Node, Action, Page, NodeState, Tag
 from forum.models.node import NodeMetaClass
@@ -548,7 +549,14 @@ def node_management(request):
     'hide_menu': True
     }))
 
+@super_user_required
+def test_email_settings(request):
+    user = request.user
 
+    send_template_email([user,], 'osqaadmin/mail_test.html', { 'user' : user })
 
-
-
+    return render_to_response(
+        'osqaadmin/test_email_settings.html',
+        { 'user': user, },
+        RequestContext(request)
+    )
\ No newline at end of file