Merge branch 'master' of https://github.com/bashmak/djing

9 years ago · 9aef439b44
6 changed files with 32 additions and 23 deletions
--- a/taskapp/models.py
+++ b/taskapp/models.py
@ -118,4 +118,13 @@ def task_handler(sender, instance, **kwargs):
              group_name])                  # Имя группы абонента


+def task_delete(sender, instance, **kwargs):
+    ChangeLog.objects.create(
+        task=instance,
+        act_type=b'd',
+        who=instance.author
+    )
+
+
 models.signals.post_save.connect(task_handler, sender=Task)
+models.signals.post_delete.connect(task_delete, sender=Task)
--- a/taskapp/urls.py
+++ b/taskapp/urls.py
@ -10,6 +10,7 @@ urlpatterns = [
    url(r'^(?P<task_id>\d+)/delete$', views.task_delete, name='delete'),
    url(r'^(?P<task_id>\d+)/fin$', views.task_finish, name='finish'),
    url(r'^(?P<task_id>\d+)/begin$', views.task_begin, name='begin'),
+    url(r'^(?P<task_id>\d+)/remind', views.remind, name='remind'),
    url(r'^add$', views.task_add_edit, name='add'),
    url(r'^active$', views.active_tasks, name='active_tasks'),
    url(r'^finished$', views.finished_tasks, name='finished_tasks'),
--- a/taskapp/views.py
+++ b/taskapp/views.py
@ -170,3 +170,11 @@ def task_begin(request, task_id):
    task.begin(request.user)
    task.save(update_fields=['state'])
    return redirect('taskapp:home')
+
+
+@login_required
+@permission_required('taskapp.can_viewall')
+def remind(request, task_id):
+    task = get_object_or_404(Task, id=task_id)
+    task.save(update_fields=['state'])
+    return redirect('taskapp:home')
--- a/templates/base.html
+++ b/templates/base.html
@ -19,23 +19,7 @@
 <body>

 <!-- Modal -->
-<div class="modal fade" id="modFrm" tabindex="-1" role="dialog" aria-hidden="true">
-    <div class="modal-dialog">
-        <div class="modal-content" id="modContent">
-            <div class="modal-header warning">
-                <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                <h4 class="modal-title" id="myModalLabel"><span class="glyphicon glyphicon-warning-sign"></span>
-                    Надпись вверху</h4>
-            </div>
-            <div class="modal-body">
-                тут содержимое блока
-            </div>
-            <div class="modal-footer">
-                <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть</button>
-            </div>
-        </div>
-    </div>
-</div>
+<div class="modal fade" id="modFrm" tabindex="-1" role="dialog" aria-hidden="true"></div>

 <!-- Fixed navbar -->
 <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@ -91,11 +75,9 @@

                    <a href="{% url 'acc_app:profile' %}">
                        {% if user.avatar %}
-                            <img alt="{{ user.avatar.min }}" class="img-circle img-responsive"
-                                 src="{{ user.avatar.min }}"/>
+                            <img alt="авка" class="img-circle img-responsive" src="{{ user.avatar.min }}"/>
                        {% else %}
-                            <img src="/static/img/user_ava_min.gif" class="img-circle img-responsive"
-                                 alt="user avatar"/>
+                            <img src="/static/img/user_ava_min.gif" class="img-circle img-responsive" alt="авка"/>
                        {% endif %}
                    </a>

@ -116,7 +98,6 @@
                    </a>
                </li>

-
                {% url 'abonapp:group_list' as abongroup_list_link %}
                <li{% if abongroup_list_link in request.path %} class="active"{% endif %}>
                    <a href="{{ abongroup_list_link }}">
--- a/templates/taskapp/tasklist_all.html
+++ b/templates/taskapp/tasklist_all.html
@ -59,6 +59,11 @@
                            <span class="glyphicon glyphicon-edit"></span>
                        </a>
                    {% endif %}
+                    {% if perms.taskapp.can_viewall %}
+                        <a href="{% url 'taskapp:remind' task.id %}" class="btn btn-default btn-sm" title="Напомнить">
+                            <span class="glyphicon glyphicon-bell"></span>
+                        </a>
+                    {% endif %}
                </td>
                </tr>
            {% empty %}
--- a/templates/taskapp/tasklist_own.html
+++ b/templates/taskapp/tasklist_own.html
@ -34,10 +34,15 @@
                <td>{{ task.get_priority_display }}</td>
                <td>{{ task.time_of_create|date:'d N yг H:i:s' }}</td>
                <td>{% if task.attachment %}<a href="{{ task.attachment.url }}" target="_blank">{{ task.attachment.name }}</a>{% else %}&horbar;{% endif %}</td>
-                <td class="btn-group">
+                <td class="btn-group btn-group-justified">
                    <a href="{% url 'taskapp:edit' task.id %}" class="btn btn-sm btn-default" title="Редактировать">
                        <span class="glyphicon glyphicon-edit"></span>
                    </a>
+                    {% if perms.taskapp.can_viewall %}
+                        <a href="{% url 'taskapp:remind' task.id %}" class="btn btn-default btn-sm" title="Напомнить">
+                            <span class="glyphicon glyphicon-bell"></span>
+                        </a>
+                    {% endif %}
                    <a href="{% url 'taskapp:delete' task.id %}" class="btn btn-sm btn-danger" title="Удалить">
                        <span class="glyphicon glyphicon-remove-circle"></span>
                    </a>