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

Warn moderator that he is about to mess up threads. #142

Ralfp 12 лет назад
Родитель
Сommit
37eb33eed2
2 измененных файлов с 17 добавлено и 1 удалено
  1. 11 0
      misago/apps/threadtype/list/moderation.py
  2. 6 1
      templates/cranefly/threads/merge.html

+ 11 - 0
misago/apps/threadtype/list/moderation.py

@@ -156,10 +156,21 @@ class ThreadsListModeration(object):
             self.message = Message(form.non_field_errors()[0], 'error')
         else:
             form = MergeThreadsForm(request=self.request, threads=threads)
+
+        warning = None
+        lookback = threads[0].last_post_id
+        for thread in threads[1:]:
+            if thread.start_post_id < lookback:
+                warning = Message(_("Warning: Posting times in one or more threads overlaps. This may result in disturbed flow of merged thread."), 'warning')
+                break
+            else:
+                lookback = thread.last_post_id
+
         return self.request.theme.render_to_response(('%ss/merge.html' % self.type_prefix),
                                                      {
                                                       'type_prefix': self.type_prefix,
                                                       'message': self.message,
+                                                      'warning': warning,
                                                       'forum': self.forum,
                                                       'parents': self.parents,
                                                       'threads': threads,

+ 6 - 1
templates/cranefly/threads/merge.html

@@ -30,9 +30,14 @@
           <h1>{% trans %}Merge Threads{% endtrans %}</h1>
         </div>
 
-        {% if message %}
+        {% if message or warning %}
         <div class="messages-list">
+          {% if message %}
           {{ macros.draw_message(message) }}
+          {% endif %}
+          {% if warning %}
+          {{ macros.draw_message(warning) }}
+          {% endif %}
         </div>
         {% endif %}