Просмотр исходного кода

Fixed messages implementation to set flashes

Rafał Pitoń 12 лет назад
Родитель
Сommit
3a7457115a
3 измененных файлов с 10 добавлено и 5 удалено
  1. 1 1
      misago/apps/admin/settings/views.py
  2. 8 4
      misago/messages.py
  3. 1 0
      templates/admin/settings/settings.html

+ 1 - 1
misago/apps/admin/settings/views.py

@@ -44,7 +44,7 @@ def settings(request, group_id=None, group_slug=None):
     SettingsGroupForm = type('SettingsGroupForm', (Form,), group_form)
 
     #Submit form
-    message = request.messages.get_message('admin_settings')
+    message = messages.get_message(request, 'admin_settings')
     if request.method == 'POST':
         form = SettingsGroupForm(request.POST, request=request)
         if form.is_valid():

+ 8 - 4
misago/messages.py

@@ -54,21 +54,25 @@ def get_messages(request, owner=None):
     return request.messages.get_messages(owner)
 
 
+def get_message(request, owner=None):
+    return request.messages.get_message(owner)
+
+
 def add_message(request, level, message, owner=None):
     request.messages.set_flash(unicode(message), level=level, owner=owner)
 
 
 def info(request, message, owner=None):
-    request.messages.set_message(message, level=INFO, owner=owner)
+    add_message(request, INFO, message, owner=owner)
 
 
 def success(request, message, owner=None):
-    request.messages.set_message(message, level=SUCCESS, owner=owner)
+    add_message(request, SUCCESS, message, owner=owner)
 
 
 def warning(request, message, owner=None):
-    request.messages.set_message(message, level=WARNING, owner=owner)
+    add_message(request, WARNING, message, owner=owner)
 
 
 def error(request, message, owner=None):
-    request.messages.set_message(message, level=ERROR, owner=owner)
+    add_message(request, ERROR, message, owner=owner)

+ 1 - 0
templates/admin/settings/settings.html

@@ -30,6 +30,7 @@
     {% if active_group.description %}
     <p>{{ _(active_group.description) }}</p>{% endif %}
     <form class="form-vertical" action="{{ url('admin_settings', group_id=active_group.id, group_slug=active_group.key) }}" method="post">
+      <input type="hidden" name="{{ csrf_id }}" value="{{ csrf_token }}">
       <div class="form-container">
         {% for fieldset in form %}
         <fieldset>