Convert to using new todolist models everywhere

This is a rather widespread set of changes converting usage to the new
todo list and todo list package model recently introduced. The data
migration is not included in this commit. After this commit, the old
model should no longer be referenced anywhere.

Signed-off-by: Dan McGee <dan@archlinux.org>

4 files changed, 20 insertions, 31 deletions

diff --git a/templates/todolists/email_notification.txt b/templates/todolists/email_notification.txt
index 8b22b465..e454ec79 100644
--- a/templates/todolists/email_notification.txt
+++ b/templates/todolists/email_notification.txt
@@ -1,7 +1,7 @@
 {% autoescape off %}The todo list "{{ todolist.name }}" has had the following packages added to it for which you are a maintainer:
 
 {% for tpkg in todo_packages %}
-* {{ tpkg.pkg.repo.name|lower }}/{{ tpkg.pkg.pkgname }} ({{ tpkg.pkg.arch.name }}) - {{ tpkg.pkg.get_full_url }}{% endfor %}
+* {{ tpkg.repo.name|lower }}/{{ tpkg.pkgname }} ({{ tpkg.arch.name }}) - {{ tpkg.pkg.get_full_url }}{% endfor %}
 
 Todo list information:
 Name: {{ todolist.name }}
diff --git a/templates/todolists/list.html b/templates/todolists/list.html
index 51f9b570..4e456d28 100644
--- a/templates/todolists/list.html
+++ b/templates/todolists/list.html
@@ -8,7 +8,7 @@
 
     <h2>Package Todo Lists</h2>
 
-    {% if perms.main.add_todolist %}
+    {% if perms.todolists.add_todolist %}
     <ul class="admin-actions">
         <li><a href="/todo/add/" title="Add new todo list">Add Todo List</a></li>
     </ul>
@@ -31,7 +31,7 @@
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ list.get_absolute_url }}"
                         title="View todo list: {{ list.name }}">{{ list.name }}</a></td>
-                <td>{{ list.date_added|date }}</td>
+                <td>{{ list.created|date }}</td>
                 <td>{{ list.creator.get_full_name }}</td>
                 <td class="wrap">{{ list.description|urlize }}</td>
                 <td>{{ list.pkg_count }}</td>
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index 9e0e5234..41caf5b0 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -30,7 +30,7 @@
         <div class="todo-list">
             <a name="{{ list.id }}"></a>
             <h4>{{ list.name }}</h4>
-            <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+            <p class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</p>
             <div>{{ list.description|urlize|linebreaks }}</div>
             <table id="todo-pkglist-{{ list.id }}" class="results todo-table">
                 <thead>
@@ -45,17 +45,11 @@
                 <tbody>
                     {% for pkg in list.packages %}
                     <tr class="{% cycle 'odd' 'even' %}">
-                        <td>{% pkg_details_link pkg.pkg %}</td>
-                        <td>{{ pkg.pkg.arch.name }}</td>
-                        <td>{{ pkg.pkg.repo.name|capfirst }}</td>
-                        <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
-                        <td>
-                            {% if pkg.complete %}
-                            <span class="complete">Complete</span>
-                            {% else %}
-                            <span class="incomplete">Incomplete</span>
-                            {% endif %}
-                        </td>
+                        <td>{% pkg_details_link pkg.pkg pkg.pkgname %}</td>
+                        <td>{{ pkg.arch.name }}</td>
+                        <td>{{ pkg.repo.name|capfirst }}</td>
+                        <td>{{ pkg.maintainers|join:', ' }}</td>
+                        <td><span class="{{ pkg.status_css_class }}">{{ pkg.get_status_display }}</span></td>
                     </tr>
                     {% endfor %}
                 </tbody>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index b6f59704..0f3475a2 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -10,17 +10,17 @@
     <h2>Todo List: {{ list.name }}</h2>
 
     <ul class="admin-actions">
-        {% if perms.main.delete_todolist %}
+        {% if perms.todolists.delete_todolist %}
         <li><a href="/todo/delete/{{list.id}}/"
             title="Delete this todo list">Delete Todo List</a></li>
         {% endif %}
-        {% if perms.main.change_todolist %}
+        {% if perms.todolists.change_todolist %}
         <li><a href="/todo/edit/{{list.id}}/"
             title="Edit this todo list">Edit Todo List</a></li>
         {% endif %}
     </ul>
 
-    <p class="todo-info">{{ list.date_added|date }} - {{ list.creator.get_full_name }}</p>
+    <p class="todo-info">{{ list.created|date }} - {{ list.creator.get_full_name }}</p>
 
     <div>{{list.description|urlize|linebreaks}}</div>
 
@@ -68,27 +68,22 @@
         </thead>
         <tbody>
             {% for pkg in list.packages %}
-            <tr class="{% cycle 'odd' 'even' %}{% if user in pkg.pkg.maintainers %} mine{% endif %} {{ pkg.pkg.arch.name }} {{ pkg.pkg.repo.name|lower }}">
-                <td>{{ pkg.pkg.arch.name }}</td>
-                <td>{{ pkg.pkg.repo.name|capfirst }}</td>
-                <td>{% pkg_details_link pkg.pkg %}</td>
+            <tr class="{% cycle 'odd' 'even' %}{% if user in pkg.maintainers %} mine{% endif %} {{ pkg.arch.name }} {{ pkg.repo.name|lower }}">
+                <td>{{ pkg.arch.name }}</td>
+                <td>{{ pkg.repo.name|capfirst }}</td>
+                <td>{% pkg_details_link pkg.pkg pkg.pkgname %}</td>
                 {% if pkg.pkg.flag_date %}
                 <td><span class="flagged">{{ pkg.pkg.full_version }}</span></td>
                 {% else %}
                 <td>{{ pkg.pkg.full_version }}</td>
                 {% endif %}
-                <td>{{ pkg.pkg.maintainers|join:', ' }}</td>
+                <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
-                    {% if perms.main.change_todolistpkg %}
-                    {% if pkg.complete %}
+                    {% if perms.todolist.change_todolistpackage %}
                     <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
-                        class="status-link complete" title="Toggle completion status">Complete</a>
+                        class="status-link {{ pkg.status_css_class }}" title="Toggle completion status">{{ pkg.get_status_display }}</a>
                     {% else %}
-                    <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
-                        class="status-link incomplete" title="Toggle completion status">Incomplete</a>
-                    {% endif %}
-                    {% else %}
-                    {% if pkg.complete %}<span class="complete">Complete</span>{% else %}<span class="incomplete">Incomplete</span>{% endif %}
+                    <span class="{{ pkg.status_css_class }}">{{ pkg.get_status_display }}</span>
                     {% endif %}
                 </td>
             </tr>