Browse Source

Добавил кнопку напоминания для задач

devel
Dmitry 9 years ago
parent
commit
0ba0f607b7
  1. 1
      taskapp/urls.py
  2. 8
      taskapp/views.py
  3. 5
      templates/taskapp/tasklist_all.html
  4. 7
      templates/taskapp/tasklist_own.html

1
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+)/delete$', views.task_delete, name='delete'),
url(r'^(?P<task_id>\d+)/fin$', views.task_finish, name='finish'), 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+)/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'^add$', views.task_add_edit, name='add'),
url(r'^active$', views.active_tasks, name='active_tasks'), url(r'^active$', views.active_tasks, name='active_tasks'),
url(r'^finished$', views.finished_tasks, name='finished_tasks'), url(r'^finished$', views.finished_tasks, name='finished_tasks'),

8
taskapp/views.py

@ -170,3 +170,11 @@ def task_begin(request, task_id):
task.begin(request.user) task.begin(request.user)
task.save(update_fields=['state']) task.save(update_fields=['state'])
return redirect('taskapp:home') 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')

5
templates/taskapp/tasklist_all.html

@ -59,6 +59,11 @@
<span class="glyphicon glyphicon-edit"></span> <span class="glyphicon glyphicon-edit"></span>
</a> </a>
{% endif %} {% 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> </td>
</tr> </tr>
{% empty %} {% empty %}

7
templates/taskapp/tasklist_own.html

@ -34,10 +34,15 @@
<td>{{ task.get_priority_display }}</td> <td>{{ task.get_priority_display }}</td>
<td>{{ task.time_of_create|date:'d N yг H:i:s' }}</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>{% 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="Редактировать"> <a href="{% url 'taskapp:edit' task.id %}" class="btn btn-sm btn-default" title="Редактировать">
<span class="glyphicon glyphicon-edit"></span> <span class="glyphicon glyphicon-edit"></span>
</a> </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="Удалить"> <a href="{% url 'taskapp:delete' task.id %}" class="btn btn-sm btn-danger" title="Удалить">
<span class="glyphicon glyphicon-remove-circle"></span> <span class="glyphicon glyphicon-remove-circle"></span>
</a> </a>

Loading…
Cancel
Save