From 3a6a41bd2ffbea2d61618f3997ea706b93f0a79e Mon Sep 17 00:00:00 2001
From: Zambom <erikzambom@hotmail.com>
Date: Mon, 7 Nov 2016 20:59:20 -0300
Subject: [PATCH] Applying date limit [Issue: #259]

---
 forum/models.py                                    |  7 +++++++
 forum/static/js/forum.js                           |  2 ++
 forum/templates/forum/forum_view.html              | 76 +++++++++++++++++++++++++++++++++++++++-------------------------------------
 forum/templates/post/post_list.html                | 36 +++++++++++++++++++-----------------
 forum/templates/post_answers/post_answer_list.html | 24 +++++++++++++-----------
 5 files changed, 80 insertions(+), 65 deletions(-)

diff --git a/forum/models.py b/forum/models.py
index 07cf60a..554b5fe 100644
--- a/forum/models.py
+++ b/forum/models.py
@@ -6,6 +6,8 @@ from autoslug.fields import AutoSlugField
 from courses.models import Activity
 from users.models import User
 
+from datetime import date
+
 """
 It's one kind of activity available for a Topic.
 It works like a 'topic' of forum, which users can post to it and answer posts of it.
@@ -23,6 +25,11 @@ class Forum(Activity):
 	def __str__(self):
 		return self.name
 
+	def is_closed(self):
+		today = date.today()
+
+		return self.limit_date < today
+
 	
 """
 It represents a post made in a forum (topic)
diff --git a/forum/static/js/forum.js b/forum/static/js/forum.js
index 43d958d..b732088 100644
--- a/forum/static/js/forum.js
+++ b/forum/static/js/forum.js
@@ -62,6 +62,7 @@ function createForum(url, topic) {
 function setForumCreateFormSubmit(topic) {
     $('.date-picker').datepicker({
         language: locale,
+        startDate: "dateToday"
     });
 
     var frm = $('#forum_create');
@@ -114,6 +115,7 @@ function editForum(url, forum, success_message) {
 function setForumUpdateFormSubmit(success_message) {
     $('.date-picker').datepicker({
         language: locale,
+        startDate: "dateToday"
     });
 
     var frm = $('#forum_create');
diff --git a/forum/templates/forum/forum_view.html b/forum/templates/forum/forum_view.html
index c331937..8351b2b 100644
--- a/forum/templates/forum/forum_view.html
+++ b/forum/templates/forum/forum_view.html
@@ -59,45 +59,47 @@
                     <h4><b>{% trans 'Opened in' %}:</b> {{ forum.create_date }}</h4>
                 </div>
             </div>
-            <div class="form_post_block">
-                <hr />
-                <form id="form_post" method="post" action="{% url 'course:forum:create_post' %}" enctype="multipart/form-data">
-                    {% csrf_token %}
-                    {% for field in form %}
-                        {% if field.field.widget.input_type == 'hidden' %}
-                            {% render_field field class='form-control' value=forum.id %}
-                        {% else %}
-                            <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
-                                <div class="input-group">
-                                    {% render_field field class='form-control' placeholder="Post a message" %}
-                                    <span class="help-block">{{ field.help_text }}</span>
-                                    {% if field.errors %}
-                                        <div class="row">
-                                            <br />
-                                            <div class="alert alert-danger alert-dismissible" role="alert">
-                                                <button type="button" class="close" data-dismiss="alert" aria-label="Close">
-                                                    <span aria-hidden="true">&times;</span>
-                                                </button>
-                                                <ul>
-                                                    {% for error in field.errors %}
-                                                        <li>{{ error }}</li>
-                                                    {% endfor %}
-                                                </ul>
+            {% if not forum.is_closed %}
+                <div class="form_post_block">
+                    <hr />
+                    <form id="form_post" method="post" action="{% url 'course:forum:create_post' %}" enctype="multipart/form-data">
+                        {% csrf_token %}
+                        {% for field in form %}
+                            {% if field.field.widget.input_type == 'hidden' %}
+                                {% render_field field class='form-control' value=forum.id %}
+                            {% else %}
+                                <div class="form-group {% if form.has_error %} has-error {% endif %} is-fileinput">
+                                    <div class="input-group">
+                                        {% render_field field class='form-control' placeholder="Post a message" %}
+                                        <span class="help-block">{{ field.help_text }}</span>
+                                        {% if field.errors %}
+                                            <div class="row">
+                                                <br />
+                                                <div class="alert alert-danger alert-dismissible" role="alert">
+                                                    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+                                                        <span aria-hidden="true">&times;</span>
+                                                    </button>
+                                                    <ul>
+                                                        {% for error in field.errors %}
+                                                            <li>{{ error }}</li>
+                                                        {% endfor %}
+                                                    </ul>
+                                                </div>
                                             </div>
-                                        </div>
-                                    {% endif %}
-                                    <span class="input-group-btn">
-                                        <button type="submit" class="btn btn-fab btn-fab-mini">
-                                            <i class="material-icons">{% trans 'send' %}</i>
-                                        </button>
-                                    </span>
+                                        {% endif %}
+                                        <span class="input-group-btn">
+                                            <button type="submit" class="btn btn-fab btn-fab-mini">
+                                                <i class="material-icons">{% trans 'send' %}</i>
+                                            </button>
+                                        </span>
+                                    </div>
                                 </div>
-                            </div>
-                        {% endif %}
-                    {% endfor %}
-                </form>
-                <hr />
-            </div>
+                            {% endif %}
+                        {% endfor %}
+                    </form>
+                    <hr />
+                </div>
+            {% endif %}
             <div id="posts_list">
                 {% list_posts request forum %}
             </div>
diff --git a/forum/templates/post/post_list.html b/forum/templates/post/post_list.html
index 7a1cdaf..509cc79 100644
--- a/forum/templates/post/post_list.html
+++ b/forum/templates/post/post_list.html
@@ -6,23 +6,25 @@
             <div id="post_{{ post.id }}" class="col-sm-12 col-xs-12">
                 <h3 class="user-name">
                     {{ post.user }}
-                    <div class="pull-right">
-                        <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
-                            <i class="material-icons">{% trans 'reply' %}</i>
-                        </a>
-                        {% if request.user|has_role:'system_admin' or request.user == post.user %}
-                            {% csrf_token %}
-                            <div class="btn-group icon-more-horiz">
-                                <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 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>
-                            </div>
-                        {% endif %}
-                    </div>
+                    {% if not post.forum.is_closed %}
+                        <div class="pull-right">
+                            <a href="javascript:answer('{{ post.id }}', '{% url 'course:forum:reply_post' %}');">
+                                <i class="material-icons">{% trans 'reply' %}</i>
+                            </a>
+                            {% if request.user|has_role:'system_admin' or request.user == post.user %}
+                                {% csrf_token %}
+                                <div class="btn-group icon-more-horiz">
+                                    <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 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>
+                                </div>
+                            {% endif %}
+                        </div>
+                    {% endif %}
                 </h3>
                 <div class="post_content">
                     <div class="card-data">
diff --git a/forum/templates/post_answers/post_answer_list.html b/forum/templates/post_answers/post_answer_list.html
index 5d0e066..8e7f2b6 100644
--- a/forum/templates/post_answers/post_answer_list.html
+++ b/forum/templates/post_answers/post_answer_list.html
@@ -7,18 +7,20 @@
                 <div class="col-sm-12 col-xs-12">
                     <h3 class="user-name">
                         {{ answer.user }}
-                        {% if request.user|has_role:'system_admin' or request.user == answer.user %}
-                            <div class="pull-right">
-                                <div class="btn-group icon-more-horiz">
-                                    <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 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>
+                        {% if not answer.post.forum.is_closed %}
+                            {% if request.user|has_role:'system_admin' or request.user == answer.user %}
+                                <div class="pull-right">
+                                    <div class="btn-group icon-more-horiz">
+                                        <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 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>
+                                    </div>
                                 </div>
-                            </div>
+                            {% endif %}
                         {% endif %}
                     </h3>
                     <div class="post_answer_content">
--
libgit2 0.21.2