From 4be136ddb44c6bf344c080c40f88d7ab7bb40ea4 Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Wed, 12 Oct 2016 16:47:08 -0300
Subject: [PATCH] Fixing some forum bugs

---
 forum/static/js/forum.js                             | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------
 forum/templates/forum/forum_view.html                |   2 +-
 forum/templates/post/post_list.html                  |   2 +-
 forum/templates/post/post_render.html                |   2 +-
 forum/templates/post_answers/post_answer_list.html   |   2 +-
 forum/templates/post_answers/post_answer_render.html |   2 +-
 forum/views.py                                       |   5 ++++-
 7 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/forum/static/js/forum.js b/forum/static/js/forum.js
index c21ba63..61dc4e2 100644
--- a/forum/static/js/forum.js
+++ b/forum/static/js/forum.js
@@ -46,7 +46,7 @@ $(document).ready(function (){
 
 /*
 *
-* Function to load create forum's form and set the submit function
+* Function to load create forum's form
 *
 */
 function createForum(url, topic) {
@@ -57,35 +57,45 @@ function createForum(url, topic) {
             $(".forum_form").html(data);
             $("#id_topic").val(topic);
 
-            $('.date-picker').datepicker({
-                format: 'dd/mm/yyyy',
-            });
+            setForumCreateFormSubmit();
+        }
+    });
 
-            var frm = $('#forum_create');
-            frm.submit(function () {
-                $.ajax({
-                    type: frm.attr('method'),
-                    url: frm.attr('action'),
-                    data: frm.serialize(),
-                    success: function (data) {
-                        data = data.split('-');
+    $("#createForum").modal();
+}
 
-                        $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
+/*
+*
+* Function to set the forum's create form submit function
+*
+*/
+function setForumCreateFormSubmit() {
+    $('.date-picker').datepicker({
+        format: 'dd/mm/yyyy',
+    });
 
-                        $("#createForum").modal('hide');
+    var frm = $('#forum_create');
+    frm.submit(function () {
+        $.ajax({
+            type: frm.attr('method'),
+            url: frm.attr('action'),
+            data: frm.serialize(),
+            success: function (data) {
+                data = data.split('-');
 
-                        showForum(data[0], data[1]);
-                    },
-                    error: function(data) {
-                        $(".forum_form").html(data.responseText);
-                    }
-                });
-                return false;
-            });
-        }
-    });
+                $('.foruns_list').append("<a id='forum_"+data[1]+"' href='"+data[0]+"'>"+data[2]+"<br /></a>");
 
-    $("#createForum").modal();
+                $("#createForum").modal('hide');
+
+                showForum(data[0], data[1]);
+            },
+            error: function(data) {
+                $(".forum_form").html(data.responseText);
+                setForumCreateFormSubmit();
+            }
+        });
+        return false;
+    });
 }
 
 /*
@@ -100,29 +110,7 @@ function editForum(url, forum, success_message) {
         success: function(data) {
             $(".forum_form").html(data);
 
-            $('.date-picker').datepicker({
-                format: 'dd/mm/yyyy',
-            });
-
-            var frm = $('#forum_create');
-            frm.submit(function () {
-                $.ajax({
-                    type: frm.attr('method'),
-                    url: frm.attr('action'),
-                    data: frm.serialize(),
-                    success: function (data) {
-                        $('.forum_view').html(data);
-
-                        alertify.success(success_message);
-
-                        $("#editForum").modal('hide');
-                    },
-                    error: function(data) {
-                        $(".forum_form").html(data.responseText);
-                    }
-                });
-                return false;
-            });
+            setForumUpdateFormSubmit(success_message);
         }
     });
 
@@ -131,6 +119,39 @@ function editForum(url, forum, success_message) {
 
 /*
 *
+* Function to set the forum's update form submit function
+*
+*/
+function setForumUpdateFormSubmit(success_message) {
+    $('.date-picker').datepicker({
+        format: 'dd/mm/yyyy',
+    });
+
+    var frm = $('#forum_create');
+    frm.submit(function () {
+        $.ajax({
+            type: frm.attr('method'),
+            url: frm.attr('action'),
+            data: frm.serialize(),
+            success: function (data) {
+                $('.forum_view').html(data);
+
+                alertify.success(success_message);
+
+                $("#editForum").modal('hide');
+            },
+            error: function(data) {
+                $(".forum_form").html(data.responseText);
+
+                setForumUpdateFormSubmit(success_message);
+            }
+        });
+        return false;
+    });
+}
+
+/*
+*
 * Function to delete a forum
 *
 */
diff --git a/forum/templates/forum/forum_view.html b/forum/templates/forum/forum_view.html
index 9ca54b3..18272fc 100644
--- a/forum/templates/forum/forum_view.html
+++ b/forum/templates/forum/forum_view.html
@@ -50,7 +50,7 @@
 {% endblock %}
 
 {% block content %}
-    <div class="row panel panel-default">
+    <div class="panel panel-default">
         <div class="panel-body">
             <div class="comments-list">
                 <div class="section-heading forum_view">
diff --git a/forum/templates/post/post_list.html b/forum/templates/post/post_list.html
index 020c576..9266c99 100644
--- a/forum/templates/post/post_list.html
+++ b/forum/templates/post/post_list.html
@@ -16,7 +16,7 @@
                                 <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     <i class="material-icons">more_horiz</i>
                                 </a>
-                                <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenu1">
                                     <li><a href="javascript:edit_post('{% url 'course:forum:update_post' post.id %}', '{{ post.id }}', '{% trans 'Post edited successfully!' %}')"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
                                     <li><a href="javascript:javascript:delete_post('{% url 'course:forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                                 </ul>
diff --git a/forum/templates/post/post_render.html b/forum/templates/post/post_render.html
index e05b444..1b82d32 100644
--- a/forum/templates/post/post_render.html
+++ b/forum/templates/post/post_render.html
@@ -14,7 +14,7 @@
                         <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                             <i class="material-icons">more_horiz</i>
                         </a>
-                        <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                        <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenu1">
                             <li><a href="javascript:edit_post('{% url 'course:forum:update_post' post.id %}', '{{ post.id }}', '{% trans 'Post edited successfully!' %}')"></li>
                             <li><a href="javascript:delete_post('{% url 'course:forum:delete_post' post.id %}', '{{ post.id }}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                         </ul>
diff --git a/forum/templates/post_answers/post_answer_list.html b/forum/templates/post_answers/post_answer_list.html
index 9869908..5d0e066 100644
--- a/forum/templates/post_answers/post_answer_list.html
+++ b/forum/templates/post_answers/post_answer_list.html
@@ -13,7 +13,7 @@
                                     <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                         <i class="material-icons">more_horiz</i>
                                     </a>
-                                    <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                                    <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenu1">
                                         <li><a href="javascript:edit_post_answer('{% url 'course:forum:update_post_answer' answer.id %}', '{{ answer.id }}', '{% trans 'Answer edited sucessfully!' %}')"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
                                         <li><a href="javascript:delete_answer('{% url 'course:forum:delete_answer' answer.id %}', '{{ answer.id }}', '{% trans "Are you sure you want to delete this answer?" %}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                                     </ul>
diff --git a/forum/templates/post_answers/post_answer_render.html b/forum/templates/post_answers/post_answer_render.html
index 35532ff..15ca97a 100644
--- a/forum/templates/post_answers/post_answer_render.html
+++ b/forum/templates/post_answers/post_answer_render.html
@@ -11,7 +11,7 @@
                             <a class="btn btn-default btn-xs dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                 <i class="material-icons">more_horiz</i>
                             </a>
-                            <ul class="dropdown-menu" aria-labelledby="dropdownMenu1">
+                            <ul class="dropdown-menu pull-right" aria-labelledby="dropdownMenu1">
                                 <li><a href="javascript:edit_post_answer('{% url 'course:forum:update_post_answer' answer.id %}', '{{ answer.id }}', '{% trans 'Answer edited sucessfully!' %}')"><i class="material-icons">create</i> {% trans 'Edit' %}</a></li>
                                 <li><a href="javascript:delete_answer('{% url 'course:forum:delete_answer' answer.id %}', '{{ answer.id }}', '{% trans "Are you sure you want to delete this answer?" %}')"><i class="material-icons">delete_sweep</i> {% trans 'Remove' %}</a></li>
                             </ul>
diff --git a/forum/views.py b/forum/views.py
index fdb6d72..409799a 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -44,7 +44,10 @@ class CreateForumView(LoginRequiredMixin, generic.edit.CreateView):
 	form_class = ForumForm
 	
 	def form_invalid(self, form):
-		return self.render_to_response(self.get_context_data(form = form), status = 400)
+		context = super(CreateForumView, self).form_invalid(form)
+		context.status_code = 400
+
+		return context
 
 	def get_success_url(self):
 		self.success_url = reverse('course:forum:render_forum', args = (self.object.id, ))
--
libgit2 0.21.2