Browse Source

Расставил права

devel
Dmitry 9 years ago
parent
commit
f9d7a03dc2
  1. 2
      templates/taskapp/footer_btns.html
  2. 4
      templates/taskapp/tasklist.html
  3. 7
      templates/taskapp/tasklist_active.html
  4. 2
      templates/taskapp/tasklist_all.html
  5. 4
      templates/taskapp/tasklist_finish.html
  6. 10
      templates/taskapp/tasklist_own.html

2
templates/taskapp/footer_btns.html

@ -1,6 +1,8 @@
{% if perms.taskapp.add_task %}
<a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success" title="Создать новую задачу"> <a href="{% url 'taskapp:add' %}" class="btn btn-sm btn-success" title="Создать новую задачу">
<span class="glyphicon glyphicon-plus"></span> Добавить задачу <span class="glyphicon glyphicon-plus"></span> Добавить задачу
</a> </a>
{% endif %}
{% if perms.taskapp.can_viewall %} {% if perms.taskapp.can_viewall %}
<a href="{% url 'taskapp:all_tasks' %}" class="btn btn-sm btn-info"> <a href="{% url 'taskapp:all_tasks' %}" class="btn btn-sm btn-info">
<span class="glyphicon glyphicon-baby-formula"></span> Просмотреть все задачи <span class="glyphicon glyphicon-baby-formula"></span> Просмотреть все задачи

4
templates/taskapp/tasklist.html

@ -37,15 +37,13 @@
<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 colspan="3" class="btn-group btn-group-justified"> <td colspan="3" class="btn-group btn-group-justified">
{% if perms.taskapp.can_change_task %}
<a href="{% url 'taskapp:begin' task.id %}" class="btn btn-primary btn-xs" title="Начать"> <a href="{% url 'taskapp:begin' task.id %}" class="btn btn-primary btn-xs" title="Начать">
<span class="glyphicon glyphicon-cog"></span> <span class="glyphicon glyphicon-cog"></span>
</a> </a>
{% endif %}
<a href="{% url 'taskapp:finish' task.id %}" class="btn btn-success btn-xs" title="Завершить"> <a href="{% url 'taskapp:finish' task.id %}" class="btn btn-success btn-xs" title="Завершить">
<span class="glyphicon glyphicon-ok"></span> <span class="glyphicon glyphicon-ok"></span>
</a> </a>
{% if perms.taskapp.can_change_task %}
{% if perms.taskapp.change_task %}
<a href="{% url 'taskapp:edit' task.id %}" class="btn btn-default btn-xs" title="Редактировать"> <a href="{% url 'taskapp:edit' task.id %}" class="btn btn-default btn-xs" title="Редактировать">
<span class="glyphicon glyphicon-edit"></span> <span class="glyphicon glyphicon-edit"></span>
</a> </a>

7
templates/taskapp/tasklist_active.html

@ -41,16 +41,11 @@
<a href="{% url 'taskapp:finish' task.id %}" class="btn btn-sm btn-success" title="Завершить"> <a href="{% url 'taskapp:finish' task.id %}" class="btn btn-sm btn-success" title="Завершить">
<span class="glyphicon glyphicon-ok"></span> <span class="glyphicon glyphicon-ok"></span>
</a> </a>
{% if perms.taskapp.can_change_task %}
{% if perms.taskapp.change_task %}
<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>
{% endif %} {% endif %}
{% if perms.taskapp.can_delete_task %}
<a href="#" class="btn btn-sm btn-danger disabled" title="Удалить">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
{% endif %}
</td> </td>
</tr> </tr>
{% empty %} {% empty %}

2
templates/taskapp/tasklist_all.html

@ -54,7 +54,7 @@
<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 colspan="3" class="btn-group btn-group-justified"> <td colspan="3" class="btn-group btn-group-justified">
{% if perms.taskapp.can_change_task %}
{% if perms.taskapp.change_task %}
<a href="{% url 'taskapp:edit' task.id %}" class="btn btn-default btn-sm" title="Редактировать"> <a href="{% url 'taskapp:edit' task.id %}" class="btn btn-default btn-sm" title="Редактировать">
<span class="glyphicon glyphicon-edit"></span> <span class="glyphicon glyphicon-edit"></span>
</a> </a>

4
templates/taskapp/tasklist_finish.html

@ -38,12 +38,12 @@
<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 colspan="3" class="btn-group"> <td colspan="3" class="btn-group">
{% if perms.taskapp.can_change_task %}
{% if perms.taskapp.change_task %}
<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>
{% endif %} {% endif %}
{% if perms.taskapp.can_delete_task %}
{% if perms.taskapp.delete_task %}
<a href="#" class="btn btn-sm btn-danger disabled" title="Удалить"> <a href="#" class="btn btn-sm btn-danger disabled" title="Удалить">
<span class="glyphicon glyphicon-remove-circle"></span> <span class="glyphicon glyphicon-remove-circle"></span>
</a> </a>

10
templates/taskapp/tasklist_own.html

@ -35,7 +35,7 @@
<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 btn-group-justified"> <td class="btn-group btn-group-justified">
{% if perms.taskapp.can_change_task %}
{% if perms.taskapp.change_task %}
<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>
@ -45,9 +45,11 @@
<span class="glyphicon glyphicon-bell"></span> <span class="glyphicon glyphicon-bell"></span>
</a> </a>
{% endif %} {% endif %}
<a href="{% url 'taskapp:delete' task.id %}" class="btn btn-sm btn-danger" title="Удалить">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
{% if perms.taskapp.delete_task %}
<a href="{% url 'taskapp:delete' task.id %}" class="btn btn-sm btn-danger" title="Удалить">
<span class="glyphicon glyphicon-remove-circle"></span>
</a>
{% endif %}
</td> </td>
</tr> </tr>
{% empty %} {% empty %}

Loading…
Cancel
Save