public/coins-demo
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Rename List model to TaskList

Browse source
This commit is contained in:
Scot Hacker 2018-02-10 00:25:28 -08:00
parent 774cd3d057
commit efc2dbe11a
10 changed files with 130 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

8
todo/templates/todo/del_list.html
View file

@ -1,11 +1,11 @@
{% extends "todo/base.html" %}
{% block title %}{{ list_title }} to-do items{% endblock %}
{% block title %}Delete list{% endblock %}
{% block content %}
{% if user.is_staff %}
<h1>Delete entire list: {{ list.name }} ?</h1>
<h1>Delete entire list: {{ task_list.name }} ?</h1>
<p>Category tally:</p>
@ -19,11 +19,11 @@
<form action="" method="post" accept-charset="utf-8">
{% csrf_token %}
<input type="hidden" name="list" value="{{ list.id }}" id="some_name">
<input type="hidden" name="task_list" value="{{ task_list.id }}">
<p><input type="submit" name="delete-confirm" value="Do it! &rarr;" class="todo-button"> </p>
</form>
<a href="{% url 'todo:list_detail' list.id list_slug %}">Return to list: {{ list.name }}</a>
<a href="{% url 'todo:list_detail' task_list.id task_list.slug %}">Return to list: {{ task_list.name }}</a>
{% else %}
<p>Sorry, you don't have permission to delete lists. Please contact your group administrator.</p>

6
todo/templates/todo/email/assigned_body.txt
View file

@ -1,6 +1,6 @@
Dear {{ task.assigned_to.first_name }} -
A new task on the list {{ task.list.name }} has been assigned to you by {{ task.created_by.first_name }} {{ task.created_by.last_name }}:
A new task on the list {{ task.task_list.name }} has been assigned to you by {{ task.created_by.first_name }} {{ task.created_by.last_name }}:
{{ task.title }}
@ -16,5 +16,5 @@ Note: {{ task.note }}
Task details/comments:
http://{{ site }}{% url 'todo:task_detail' task.id %}
List {{ task.list.name }}:
http://{{ site }}{% url 'todo:list_detail' task.list.id task.list.slug %}
List {{ task.task_list.name }}:
http://{{ site }}{% url 'todo:list_detail' task.task_list.id task.task_list.slug %}

4
todo/templates/todo/email/newcomment_body.txt
View file

@ -11,6 +11,6 @@ Comment:
Task details/comments:
https://{{ site }}{% url 'todo:task_detail' task.id %}
List {{ task.list.name }}:
https://{{ site }}{% url 'todo:list_detail' task.list.id task.list.slug %}
List {{ task.task_list.name }}:
https://{{ site }}{% url 'todo:list_detail' task.task_list.id task.task_list.slug %}

11
todo/templates/todo/search_results.html
View file

@ -13,8 +13,15 @@
{% for f in found_items %}
<p><strong><a href="{% url 'todo:task_detail' f.id %}">{{ f.title }}</a></strong><br />
<span class="minor">
On list: <a href="{% url 'todo:list_detail' f.list.id f.list.slug %}">{{ f.list.name }}</a><br />
Assigned to: {% if f.assigned_to %}{{ f.assigned_to }}{% else %}Anyone{% endif %} (created by: {{ f.created_by }})<br />
In list:
<a href="{% url 'todo:list_detail' f.task_list.id f.task_list.slug %}">
{{ f.task_list.name }}
</a>
<br />
Assigned to:
{% if f.assigned_to %}{{ f.assigned_to }}{% else %}Anyone{% endif %}
(created by: {{ f.created_by }})
<br />
Complete: {{ f.completed|yesno:"Yes,No" }}
</span>
</p>

4
todo/templates/todo/view_task.html
View file

@ -26,7 +26,7 @@
<p id="slideToggle" ><strong>&rarr; Click to edit details &larr;</strong></p>
<p>
<strong>In list:</strong> <a href="{% url 'todo:list_detail' task.list.id task.list.slug %}" class="showlink">{{ task.list }}</a><br />
<strong>In list:</strong> <a href="{% url 'todo:list_detail' task.task_list.id task.task_list.slug %}" class="showlink">{{ task.list }}</a><br />
<strong>Assigned to:</strong> {% if task.assigned_to %}{{ task.assigned_to.get_full_name }}{% else %}Anyone{% endif %}<br />
<strong>Created by:</strong> {{ task.created_by.first_name }} {{ task.created_by.last_name }}<br />
<strong>Due date:</strong> {{ task.due_date }}<br />
@ -48,7 +48,7 @@
<tr>
<td>List:</td>
<td>{{ form.list }} </td>
<td>{{ form.task_list }} </td>
</tr>
<tr>