alamin
/
djing
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

devel
http 9 years ago
parent
04d5dd02e8 3a17584f12
commit
9aef439b44
6 changed files with 32 additions and 23 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 9
      taskapp/models.py
  2. 1
      taskapp/urls.py
  3. 8
      taskapp/views.py
  4. 25
      templates/base.html
  5. 5
      templates/taskapp/tasklist_all.html
  6. 7
      templates/taskapp/tasklist_own.html

9
taskapp/models.py
View File

@ -118,4 +118,13 @@ def task_handler(sender, instance, **kwargs):
group_name]) # Имя группы абонента 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_save.connect(task_handler, sender=Task)
models.signals.post_delete.connect(task_delete, sender=Task)

1
taskapp/urls.py
View File

@ -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
View File

@ -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')

25
templates/base.html
View File

@ -19,23 +19,7 @@
<body> <body>
<!-- Modal --> <!-- 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 --> <!-- Fixed navbar -->
<nav class="navbar navbar-inverse navbar-fixed-top" role="navigation"> <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
@ -91,11 +75,9 @@
<a href="{% url 'acc_app:profile' %}"> <a href="{% url 'acc_app:profile' %}">
{% if user.avatar %} {% 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 %} {% 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 %} {% endif %}
</a> </a>
@ -116,7 +98,6 @@
</a> </a>
</li> </li>
{% url 'abonapp:group_list' as abongroup_list_link %} {% url 'abonapp:group_list' as abongroup_list_link %}
<li{% if abongroup_list_link in request.path %} class="active"{% endif %}> <li{% if abongroup_list_link in request.path %} class="active"{% endif %}>
<a href="{{ abongroup_list_link }}"> <a href="{{ abongroup_list_link }}">

5
templates/taskapp/tasklist_all.html
View File

@ -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
View File

@ -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>

Write Preview
Loading…
Cancel
Save