From 8e64612aec481a866ce88da4bbf5198af14d4487 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 18 Dec 2016 17:09:59 +0000 Subject: [PATCH 1/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BB=D0=BE=D0=B3=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?= =?UTF-8?q?=D1=81=D0=B2=D0=BE=D0=B5=D0=B9=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/models.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/taskapp/models.py b/taskapp/models.py index e2b5efb..e991344 100644 --- 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) From 0ba0f607b70c649b311709c559f69b7956308ff3 Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 18 Dec 2016 17:10:37 +0000 Subject: [PATCH 2/3] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB?= =?UTF-8?q?=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20=D0=BD=D0=B0=D0=BF?= =?UTF-8?q?=D0=BE=D0=BC=D0=B8=D0=BD=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=B4=D0=BB?= =?UTF-8?q?=D1=8F=20=D0=B7=D0=B0=D0=B4=D0=B0=D1=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- taskapp/urls.py | 1 + taskapp/views.py | 8 ++++++++ templates/taskapp/tasklist_all.html | 5 +++++ templates/taskapp/tasklist_own.html | 7 ++++++- 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/taskapp/urls.py b/taskapp/urls.py index 4c54119..1be4932 100644 --- a/taskapp/urls.py +++ b/taskapp/urls.py @@ -10,6 +10,7 @@ urlpatterns = [ url(r'^(?P\d+)/delete$', views.task_delete, name='delete'), url(r'^(?P\d+)/fin$', views.task_finish, name='finish'), url(r'^(?P\d+)/begin$', views.task_begin, name='begin'), + url(r'^(?P\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'), diff --git a/taskapp/views.py b/taskapp/views.py index c7698f5..55e740a 100644 --- 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') diff --git a/templates/taskapp/tasklist_all.html b/templates/taskapp/tasklist_all.html index 48caf43..1c893eb 100644 --- a/templates/taskapp/tasklist_all.html +++ b/templates/taskapp/tasklist_all.html @@ -59,6 +59,11 @@ {% endif %} + {% if perms.taskapp.can_viewall %} + + + + {% endif %} {% empty %} diff --git a/templates/taskapp/tasklist_own.html b/templates/taskapp/tasklist_own.html index 3a80862..1af5655 100644 --- a/templates/taskapp/tasklist_own.html +++ b/templates/taskapp/tasklist_own.html @@ -34,10 +34,15 @@ {{ task.get_priority_display }} {{ task.time_of_create|date:'d N yг H:i:s' }} {% if task.attachment %}{{ task.attachment.name }}{% else %}―{% endif %} - + + {% if perms.taskapp.can_viewall %} + + + + {% endif %} From 3a17584f120f8d7dd480b3e7095c147c5804fe4c Mon Sep 17 00:00:00 2001 From: Dmitry Date: Sun, 18 Dec 2016 17:11:41 +0000 Subject: [PATCH 3/3] =?UTF-8?q?alt=20=D0=B4=D0=BB=D1=8F=20=D0=B0=D0=B2?= =?UTF-8?q?=D0=BA=D0=B8=20=D0=B8=20=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D1=81?= =?UTF-8?q?=D0=BE=D0=B4=D0=B5=D1=80=D0=B6=D0=B8=D0=BC=D0=BE=D0=B5=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3=D0=BE=20=D0=BE?= =?UTF-8?q?=D0=BA=D0=BD=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/base.html | 25 +++---------------------- 1 file changed, 3 insertions(+), 22 deletions(-) diff --git a/templates/base.html b/templates/base.html index 13a1e49..b140995 100644 --- a/templates/base.html +++ b/templates/base.html @@ -19,23 +19,7 @@ - +