From 8383a071608329c7683f7a710030ce945bd20b4d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 8 Jul 2012 23:30:48 -0500
Subject: Add a new jquery_tablesorter CDN template tag

And use it everywhere we were including the file before. This should
make updating the version a heck of a lot easier.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 02bbfd4f..c774c9cd 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -70,8 +70,7 @@ <h2>Todo List: {{ list.name }}</h2>
         </tbody>
     </table>
 </div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="{% static "jquery.tablesorter.min.js" %}"></script>
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-- 
cgit v1.2.3-54-g00ecf


From b1206a4109d3b13b06c3116ef3a2dd6c9e125a1f Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 23 Jul 2012 22:22:49 -0500
Subject: Enable filtering of todolist packages

This matches the filtering options we have on the signoffs and package
differences pages.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.js               | 23 +++++++++++++++++++++++
 templates/packages/differences.html |  3 +--
 templates/todolists/view.html       | 22 ++++++++++++++++++++--
 3 files changed, 44 insertions(+), 4 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js
index b04b1d01..e6d73414 100644
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -279,6 +279,29 @@ function todolist_flag() {
     return false;
 }
 
+function filter_todolist() {
+    /* start with all rows, and then remove ones we shouldn't show */
+    var rows = $('#dev-todo-pkglist tbody').children();
+    var all_rows = rows;
+    /* apply the filters, cheaper ones first */
+    if ($('#id_mine_only').is(':checked')) {
+        rows = rows.filter('.mine');
+    }
+    if ($('#id_incomplete').is(':checked')) {
+        rows = rows.has('.incomplete');
+    }
+    /* hide all rows, then show the set we care about */
+    all_rows.hide();
+    rows.show();
+    /* make sure we update the odd/even styling from sorting */
+    $('.results').trigger('applyWidgets');
+}
+function filter_todolist_reset() {
+    $('#id_incomplete').removeAttr('checked');
+    $('#id_mine_only').removeAttr('checked');
+    filter_todolist();
+}
+
 /* signoffs.html */
 function signoff_package() {
     var link = this;
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index 8d6887a3..b0c5b539 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -8,7 +8,7 @@
 {% if differences %}
 <div class="box">
     <h2>Package Differences by Architecture</h2>
-    <div id="differences-filter" class="filter-criteria">
+    <div class="filter-criteria">
         <h3>Filter Differences View</h3>
         <form id="diff_filter" method="post" action=".">
         <fieldset>
@@ -29,7 +29,6 @@ <h3>Filter Differences View</h3>
         </fieldset>
         </form>
     </div>
-    {# TODO some sort of spacing here #}
 
     <table id="table_differences" class="results">
         <thead>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c774c9cd..69595e1a 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -29,6 +29,20 @@ <h2>Todo List: {{ list.name }}</h2>
         <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
     {% endfor %}</ul>
 
+    <div class="filter-criteria">
+        <h3>Filter Todolist Packages</h3>
+        <form id="todolist_filter" method="post" action=".">
+        <fieldset>
+            <legend>Select filter criteria</legend>
+            <div><label for="id_mine_only" title="Show only packages maintained by me">Only Mine</label>
+                <input type="checkbox" name="mine_only" id="id_mine_only" value="mine_only"/></div>
+            <div><label for="id_incomplete" title="Packages not yet completed">Only Incomplete</label>
+                <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div>
+            <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
+        </fieldset>
+        </form>
+    </div>
+
     <table id="dev-todo-pkglist" class="results todo-table">
         <thead>
             <tr>
@@ -42,7 +56,7 @@ <h2>Todo List: {{ list.name }}</h2>
         </thead>
         <tbody>
             {% for pkg in list.packages %}
-            <tr class="{% cycle 'odd' 'even' %}">
+            <tr class="{% cycle 'odd' 'even' %}{% if user in pkg.pkg.maintainers %} mine{% endif %}">
                 <td>{{ pkg.pkg.arch.name }}</td>
                 <td>{{ pkg.pkg.repo.name|capfirst }}</td>
                 <td>{% pkg_details_link pkg.pkg %}</td>
@@ -74,12 +88,16 @@ <h2>Todo List: {{ list.name }}</h2>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $('a.status-link').click(todolist_flag);
     $(".results").tablesorter({
         widgets: ['zebra'],
         sortList: [[2,0], [0,0]],
         headers: { 5: { sorter: 'todostatus' } }
     });
+    $('a.status-link').click(todolist_flag);
+    $('#todolist_filter input').change(filter_todolist);
+    $('#criteria_reset').click(filter_todolist_reset);
+    // fire function on page load to ensure the current form selections take effect
+    filter_todolist();
 });
 </script>
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From c1a6a87e23864ea044cb15f76b9dbb16734f08d8 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 25 Jul 2012 00:45:36 -0500
Subject: Add arch and repo filter to todolist packages

This matches what we do on signoffs. Also beef up the styling a bit and
add the dynamically updated package count info.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.js         |  9 +++++++++
 templates/todolists/view.html | 16 ++++++++++++++--
 todolists/views.py            |  4 ++++
 3 files changed, 27 insertions(+), 2 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js
index e6d73414..6586d312 100644
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -287,12 +287,21 @@ function filter_todolist() {
     if ($('#id_mine_only').is(':checked')) {
         rows = rows.filter('.mine');
     }
+    /* apply arch and repo filters */
+    $('#todolist_filter .arch_filter').add(
+            '#todolist_filter .repo_filter').each(function() {
+        if (!$(this).is(':checked')) {
+            rows = rows.not('.' + $(this).val());
+        }
+    });
+    /* more expensive filter because of 'has' call */
     if ($('#id_incomplete').is(':checked')) {
         rows = rows.has('.incomplete');
     }
     /* hide all rows, then show the set we care about */
     all_rows.hide();
     rows.show();
+    $('#filter-count').text(rows.length);
     /* make sure we update the odd/even styling from sorting */
     $('.results').trigger('applyWidgets');
 }
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 69595e1a..35bc9446 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -29,16 +29,28 @@ <h2>Todo List: {{ list.name }}</h2>
         <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
     {% endfor %}</ul>
 
-    <div class="filter-criteria">
+    <p>{{ list.packages|length }} total todolist package{{ list.packages|pluralize }} found.</p>
+
+    <div class="box filter-criteria">
         <h3>Filter Todolist Packages</h3>
         <form id="todolist_filter" method="post" action=".">
         <fieldset>
             <legend>Select filter criteria</legend>
+            {% for arch in arches %}
+            <div><label for="id_arch_{{ arch.name }}" title="Architecture {{ arch.name }}">Arch {{ arch.name }}</label>
+                <input type="checkbox" name="arch_{{ arch.name }}" id="id_arch_{{ arch.name }}" class="arch_filter" value="{{ arch.name }}" checked="checked"/></div>
+            {% endfor %}
+            {% for repo in repos %}
+            <div><label for="id_repo_{{ repo.name|lower }}" title="Target Repository {{ repo.name }}">[{{ repo.name|lower }}]</label>
+                <input type="checkbox" name="repo_{{ repo.name|lower }}" id="id_repo_{{ repo.name|lower }}" class="repo_filter" value="{{ repo.name|lower }}" checked="checked"/></div>
+            {% endfor %}
             <div><label for="id_mine_only" title="Show only packages maintained by me">Only Mine</label>
                 <input type="checkbox" name="mine_only" id="id_mine_only" value="mine_only"/></div>
             <div><label for="id_incomplete" title="Packages not yet completed">Only Incomplete</label>
                 <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div>
             <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
+            <div class="clear"></div>
+            <div id="filter-info"><span id="filter-count">{{ list.packages|length }}</span> todolist packages displayed.</div>
         </fieldset>
         </form>
     </div>
@@ -56,7 +68,7 @@ <h3>Filter Todolist Packages</h3>
         </thead>
         <tbody>
             {% for pkg in list.packages %}
-            <tr class="{% cycle 'odd' 'even' %}{% if user in pkg.pkg.maintainers %} mine{% endif %}">
+            <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>
diff --git a/todolists/views.py b/todolists/views.py
index c7ba2560..b8d1dae1 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -53,9 +53,13 @@ def view(request, list_id):
     # we don't hold onto the result, but the objects are the same here,
     # so accessing maintainers in the template is now cheap
     attach_maintainers(tp.pkg for tp in todolist.packages)
+    arches = set(tp.pkg.arch for tp in todolist.packages)
+    repos = set(tp.pkg.repo for tp in todolist.packages)
     return render(request, 'todolists/view.html', {
         'list': todolist,
         'svn_roots': svn_roots,
+        'arches': sorted(arches),
+        'repos': sorted(repos),
     })
 
 # really no need for login_required on this one...
-- 
cgit v1.2.3-54-g00ecf


From 59c353e22c5a9d1fda347e82f0734cf78bc7d387 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 15 Sep 2012 08:52:34 -0500
Subject: Standardize spelling of 'todo list'

We use a space everywhere but a few places; fix the exceptions.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 35bc9446..c22bfecf 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -29,10 +29,10 @@ <h2>Todo List: {{ list.name }}</h2>
         <li><a href="pkgbases/{{ svn_root }}/">{{ svn_root }}</a></li>
     {% endfor %}</ul>
 
-    <p>{{ list.packages|length }} total todolist package{{ list.packages|pluralize }} found.</p>
+    <p>{{ list.packages|length }} total todo list package{{ list.packages|pluralize }} found.</p>
 
     <div class="box filter-criteria">
-        <h3>Filter Todolist Packages</h3>
+        <h3>Filter Todo List Packages</h3>
         <form id="todolist_filter" method="post" action=".">
         <fieldset>
             <legend>Select filter criteria</legend>
@@ -50,7 +50,7 @@ <h3>Filter Todolist Packages</h3>
                 <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div>
             <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
             <div class="clear"></div>
-            <div id="filter-info"><span id="filter-count">{{ list.packages|length }}</span> todolist packages displayed.</div>
+            <div id="filter-info"><span id="filter-count">{{ list.packages|length }}</span> todo list packages displayed.</div>
         </fieldset>
         </form>
     </div>
-- 
cgit v1.2.3-54-g00ecf


From dfbf7cdd4c273f2b1f3c1c79b97149d37e63e028 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 15 Sep 2012 09:13:58 -0500
Subject: Make todolist filtering functions more generic

This will allow us to use them elsewhere in a future commit.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 sitestatic/archweb.js         | 14 ++++++++------
 templates/todolists/view.html |  7 ++++---
 2 files changed, 12 insertions(+), 9 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js
index c274a675..783f75c6 100644
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -293,17 +293,17 @@ function todolist_flag() {
     return false;
 }
 
-function filter_todolist() {
+function filter_pkgs_list(filter_ele, tbody_ele) {
     /* start with all rows, and then remove ones we shouldn't show */
-    var rows = $('#dev-todo-pkglist tbody').children();
+    var rows = $(tbody_ele).children();
     var all_rows = rows;
     /* apply the filters, cheaper ones first */
     if ($('#id_mine_only').is(':checked')) {
         rows = rows.filter('.mine');
     }
     /* apply arch and repo filters */
-    $('#todolist_filter .arch_filter').add(
-            '#todolist_filter .repo_filter').each(function() {
+    $(filter_ele + ' .arch_filter').add(
+            filter_ele + ' .repo_filter').each(function() {
         if (!$(this).is(':checked')) {
             rows = rows.not('.' + $(this).val());
         }
@@ -319,10 +319,12 @@ function filter_todolist() {
     /* make sure we update the odd/even styling from sorting */
     $('.results').trigger('applyWidgets', [false]);
 }
-function filter_todolist_reset() {
+function filter_pkgs_reset(callback) {
     $('#id_incomplete').removeAttr('checked');
     $('#id_mine_only').removeAttr('checked');
-    filter_todolist();
+    $('.arch_filter').attr('checked', 'checked');
+    $('.repo_filter').attr('checked', 'checked');
+    callback();
 }
 
 /* signoffs.html */
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index c22bfecf..eff81aaf 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -106,10 +106,11 @@ <h3>Filter Todo List Packages</h3>
         headers: { 5: { sorter: 'todostatus' } }
     });
     $('a.status-link').click(todolist_flag);
-    $('#todolist_filter input').change(filter_todolist);
-    $('#criteria_reset').click(filter_todolist_reset);
+    filter_func = function() { filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody'); };
+    $('#todolist_filter input').change(filter_func);
+    $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
     // fire function on page load to ensure the current form selections take effect
-    filter_todolist();
+    filter_func();
 });
 </script>
 {% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From 8a8542ede6493939bd6528a72b8fd912fdf4d14b Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 11 Dec 2012 10:02:26 -0600
Subject: Use multiple separate document.ready() handlers

If one of them breaks, we don't want to prevent the rest of the on-load
events from firing. This is currently a problem on some browsers with
the versions of jQuery and tablesorter we are using.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/devel/packages.html       | 4 +++-
 templates/packages/differences.html | 5 +++--
 templates/packages/signoffs.html    | 6 ++++--
 templates/todolists/view.html       | 4 +++-
 4 files changed, 13 insertions(+), 6 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/devel/packages.html b/templates/devel/packages.html
index 4e1381ab..a62ae1ab 100644
--- a/templates/devel/packages.html
+++ b/templates/devel/packages.html
@@ -78,7 +78,9 @@ <h3>Filter Packages</h3>
 <script type="text/javascript">
 $(document).ready(function() {
     $(".results").tablesorter({widgets: ['zebra']});
-    filter_func = function() { filter_pkgs_list('#report_filter', '#dev-report-results tbody'); };
+});
+$(document).ready(function() {
+    var filter_func = function() { filter_pkgs_list('#report_filter', '#dev-report-results tbody'); };
     $('#report_filter input').change(filter_func);
     $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
     // fire function on page load to ensure the current form selections take effect
diff --git a/templates/packages/differences.html b/templates/packages/differences.html
index b0c5b539..61906fef 100644
--- a/templates/packages/differences.html
+++ b/templates/packages/differences.html
@@ -99,13 +99,14 @@ <h2>Multilib Differences to Main Packages</h2>
 <script type="text/javascript">
 $(document).ready(function() {
     $('#table_differences').tablesorter({widgets: ['zebra'], sortList: [[1,0], [0,0]]});
+    $('#table_multilib_differences').tablesorter({widgets: ['zebra'], sortList: [[5, 0]]});
+});
+$(document).ready(function() {
     $('#diff_filter select').change(filter_packages);
     $('#diff_filter input').change(filter_packages);
     $('#criteria_reset').click(filter_packages_reset);
     // fire function on page load to ensure the current form selections take effect
     filter_packages();
-
-    $('#table_multilib_differences').tablesorter({widgets: ['zebra'], sortList: [[5, 0]]});
 });
 </script>
 {% endif %}
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index fc6adca2..b6737230 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -85,9 +85,11 @@ <h3>Filter Displayed Signoffs</h3>
 <script type="text/javascript" src="{% static "archweb.js" %}"></script>
 <script type="text/javascript">
 $(document).ready(function() {
-    $('a.signoff-link').click(signoff_package);
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0]],
+    $('.results').tablesorter({widgets: ['zebra'], sortList: [[0,0]],
         headers: { 5: { sorter: 'epochdate' }, 7: { sorter: false }, 8: {sorter: false } } });
+});
+$(document).ready(function() {
+    $('a.signoff-link').click(signoff_package);
     $('#signoffs_filter input').change(filter_signoffs);
     $('#criteria_reset').click(filter_signoffs_reset);
     // fire function on page load to ensure the current form selections take effect
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index eff81aaf..b6f59704 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -105,8 +105,10 @@ <h3>Filter Todo List Packages</h3>
         sortList: [[2,0], [0,0]],
         headers: { 5: { sorter: 'todostatus' } }
     });
+});
+$(document).ready(function() {
     $('a.status-link').click(todolist_flag);
-    filter_func = function() { filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody'); };
+    var filter_func = function() { filter_pkgs_list('#todolist_filter', '#dev-todo-pkglist tbody'); };
     $('#todolist_filter input').change(filter_func);
     $('#criteria_reset').click(function() { filter_pkgs_reset(filter_func); });
     // fire function on page load to ensure the current form selections take effect
-- 
cgit v1.2.3-54-g00ecf


From c8ece67cec9c421ac0c711554edd34f022623b45 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 28 Dec 2012 00:27:20 -0600
Subject: 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>
---
 devel/views.py                             | 12 +++--
 sitestatic/archweb.css                     |  5 ++
 sitestatic/archweb.js                      | 17 +++----
 templates/devel/index.html                 | 10 ++--
 templates/todolists/email_notification.txt |  2 +-
 templates/todolists/list.html              |  4 +-
 templates/todolists/public_list.html       | 18 +++----
 templates/todolists/view.html              | 27 +++++------
 todolists/urls.py                          |  2 +-
 todolists/utils.py                         | 14 +++---
 todolists/views.py                         | 76 +++++++++++++++++-------------
 11 files changed, 97 insertions(+), 90 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/devel/views.py b/devel/views.py
index 7d5947d1..e01590a0 100644
--- a/devel/views.py
+++ b/devel/views.py
@@ -20,11 +20,12 @@
 from django.utils.timezone import now
 
 from .forms import ProfileForm, UserProfileForm, NewUserForm
-from main.models import Package, PackageFile, TodolistPkg
+from main.models import Package, PackageFile
 from main.models import Arch, Repo
 from news.models import News
 from packages.models import PackageRelation, Signoff, FlagRequest, Depend
 from packages.utils import get_signoff_groups
+from todolists.models import TodolistPackage
 from todolists.utils import get_annotated_todolists
 from .utils import get_annotated_maintainers, UserFinder
 
@@ -41,10 +42,11 @@ def index(request):
     flagged = Package.objects.normal().filter(
             flag_date__isnull=False, pkgbase__in=inner_q).order_by('pkgname')
 
-    todopkgs = TodolistPkg.objects.select_related(
-            'pkg', 'pkg__arch', 'pkg__repo').filter(complete=False)
-    todopkgs = todopkgs.filter(pkg__pkgbase__in=inner_q).order_by(
-            'list__name', 'pkg__pkgname')
+    todopkgs = TodolistPackage.objects.select_related(
+            'todolist', 'pkg', 'arch', 'repo').exclude(
+            status=TodolistPackage.COMPLETE)
+    todopkgs = todopkgs.filter(pkgbase__in=inner_q).order_by(
+            'todolist__name', 'pkgname')
 
     todolists = get_annotated_todolists(incomplete_only=True)
 
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index 6d6e1569..cfa30f5e 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -999,6 +999,11 @@ ul.admin-actions {
 .todo-table .incomplete {
     color: red;
 }
+
+.todo-table .inprogress {
+    color: darkorange;
+}
+
 .todo-info {
     margin: 0; color: #999;
 }
diff --git a/sitestatic/archweb.js b/sitestatic/archweb.js
index 42efb3fa..4a02fb63 100644
--- a/sitestatic/archweb.js
+++ b/sitestatic/archweb.js
@@ -15,7 +15,12 @@ if (typeof $ !== 'undefined' && typeof $.tablesorter !== 'undefined') {
         id: 'todostatus',
         is: function(s) { return false; },
         format: function(s) {
-            return s.match(/incomplete/i) ? 1 : 0;
+            if (s.match(/incomplete/i)) {
+                return 1;
+            } else if (s.match(/in-progress/i)) {
+                return 0.5;
+            }
+            return 0;
         },
         type: 'numeric'
     });
@@ -304,13 +309,9 @@ function todolist_flag() {
     // TODO: fix usage of this
     var link = this;
     $.getJSON(link.href, function(data) {
-        if (data.complete) {
-            $(link).text('Complete').addClass(
-                'complete').removeClass('incomplete');
-        } else {
-            $(link).text('Incomplete').addClass(
-                'incomplete').removeClass('complete');
-        }
+        $(link).text(data.status).removeClass(
+            'complete inprogress incomplete').addClass(
+            data.css_class.toLowerCase());
         /* let tablesorter know the cell value has changed */
         $('.results').trigger('updateCell', [$(link).closest('td')[0], false, null]);
     });
diff --git a/templates/devel/index.html b/templates/devel/index.html
index a07a4190..57151041 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -59,11 +59,11 @@ <h3>My Incomplete Todo List Packages</h3>
         <tbody>
             {% for todopkg in todopkgs %}
                 <tr class="{% cycle 'odd' 'even' %}">
-                    <td><a href="{{ todopkg.list.get_absolute_url }}"
-                            title="View todo list: {{ todopkg.list.name }}">{{ todopkg.list.name }}</a></td>
+                    <td><a href="{{ todopkg.todolist.get_absolute_url }}"
+                            title="View todo list: {{ todopkg.todolist.name }}">{{ todopkg.todolist.name }}</a></td>
                     <td>{% pkg_details_link todopkg.pkg %}</td>
-                    <td>{{ todopkg.pkg.repo.name }}</td>
-                    <td>{{ todopkg.pkg.arch.name }}</td>
+                    <td>{{ todopkg.repo.name }}</td>
+                    <td>{{ todopkg.arch.name }}</td>
                     <td>{{ todopkg.pkg.maintainers|join:', ' }}</td>
                 </tr>
             {% empty %}
@@ -90,7 +90,7 @@ <h3>Package Todo Lists</h3>
             <tr class="{% cycle 'odd' 'even' %}">
                 <td><a href="{{ todo.get_absolute_url }}"
                         title="View todo list: {{ todo.name }}">{{ todo.name }}</a></td>
-                <td>{{ todo.date_added|date }}</td>
+                <td>{{ todo.created|date }}</td>
                 <td>{{ todo.creator.get_full_name }}</td>
                 <td class="wrap">{{ todo.description|urlize }}</td>
                 <td>{{ todo.pkg_count }}</td>
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 @@ <h2>Package Todo Lists</h2>
             <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 @@ <h3>Open Developer Todo Lists</h3>
         <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 @@ <h4>{{ list.name }}</h4>
                 <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 @@ <h3>Filter Todo List Packages</h3>
         </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>
diff --git a/todolists/urls.py b/todolists/urls.py
index a379468f..81ac11f5 100644
--- a/todolists/urls.py
+++ b/todolists/urls.py
@@ -11,7 +11,7 @@
     (r'^edit/(?P<list_id>\d+)/$', 'edit'),
     (r'^flag/(\d+)/(\d+)/$',      'flag'),
     (r'^delete/(?P<pk>\d+)/$',
-        permission_required('main.delete_todolist')(DeleteTodolist.as_view())),
+        permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/utils.py b/todolists/utils.py
index 03c47931..d084c645 100644
--- a/todolists/utils.py
+++ b/todolists/utils.py
@@ -1,26 +1,26 @@
 from django.db import connections, router
 from django.db.models import Count
 
-from main.models import Todolist, TodolistPkg
+from .models import Todolist, TodolistPackage
 
 
 def todo_counts():
     sql = """
-SELECT list_id, count(*), sum(CASE WHEN complete THEN 1 ELSE 0 END)
-    FROM todolist_pkgs
-    GROUP BY list_id
+SELECT todolist_id, count(*), sum(CASE WHEN status = %s THEN 1 ELSE 0 END)
+    FROM todolists_todolistpackage
+    GROUP BY todolist_id
     """
-    database = router.db_for_write(TodolistPkg)
+    database = router.db_for_write(TodolistPackage)
     connection = connections[database]
     cursor = connection.cursor()
-    cursor.execute(sql)
+    cursor.execute(sql, [TodolistPackage.COMPLETE])
     results = cursor.fetchall()
     return {row[0]: (row[1], row[2]) for row in results}
 
 
 def get_annotated_todolists(incomplete_only=False):
     lists = Todolist.objects.all().select_related(
-            'creator').order_by('-date_added')
+            'creator').order_by('-created')
     lookup = todo_counts()
 
     # tag each list with package counts
diff --git a/todolists/views.py b/todolists/views.py
index 9984ef9a..94164391 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -10,39 +10,45 @@
 from django.views.generic import DeleteView
 from django.template import Context, loader
 
-from main.models import Todolist, TodolistPkg, Package, Repo
+from main.models import Package, Repo
 from packages.utils import attach_maintainers
+from .models import Todolist, TodolistPackage
 from .utils import get_annotated_todolists
 
+
 class TodoListForm(forms.ModelForm):
-    packages = forms.CharField(required=False,
+    raw = forms.CharField(label='Packages', required=False,
             help_text='(one per line)',
             widget=forms.Textarea(attrs={'rows': '20', 'cols': '60'}))
 
-    def clean_packages(self):
-        package_names = [s.strip() for s in
-                self.cleaned_data['packages'].split("\n")]
-        package_names = set(package_names)
-        packages = Package.objects.filter(pkgname__in=package_names).filter(
-                repo__testing=False, repo__staging=False).select_related(
-                        'arch', 'repo').order_by('arch')
-        return packages
+    def packages(self):
+        package_names = {s.strip() for s in
+                self.cleaned_data['raw'].split("\n")}
+        return Package.objects.normal().filter(pkgname__in=package_names,
+                repo__testing=False, repo__staging=False).order_by('arch')
 
     class Meta:
         model = Todolist
-        fields = ('name', 'description')
+        fields = ('name', 'description', 'raw')
+
 
-@permission_required('main.change_todolistpkg')
+@permission_required('todolists.change_todolistpackage')
 @never_cache
 def flag(request, list_id, pkg_id):
     todolist = get_object_or_404(Todolist, id=list_id)
-    pkg = get_object_or_404(TodolistPkg, id=pkg_id)
-    pkg.complete = not pkg.complete
-    pkg.save()
+    tlpkg = get_object_or_404(TodolistPackage, id=pkg_id)
+    # TODO: none of this; require absolute value on submit
+    if tlpkg.status == TodolistPackage.INCOMPLETE:
+        tlpkg.status = TodolistPackage.COMPLETE
+    else:
+        tlpkg.status = TodolistPackage.INCOMPLETE
+    tlpkg.save()
     if request.is_ajax():
-        return HttpResponse(
-            json.dumps({'complete': pkg.complete}),
-            mimetype='application/json')
+        data = {
+            'status': tlpkg.get_status_display(),
+            'css_class': tlpkg.status_css_class(),
+        }
+        return HttpResponse(json.dumps(data), mimetype='application/json')
     return redirect(todolist)
 
 @login_required
@@ -52,9 +58,9 @@ def view(request, list_id):
             'svn_root', flat=True).order_by().distinct()
     # we don't hold onto the result, but the objects are the same here,
     # so accessing maintainers in the template is now cheap
-    attach_maintainers(tp.pkg for tp in todolist.packages)
-    arches = {tp.pkg.arch for tp in todolist.packages}
-    repos = {tp.pkg.repo for tp in todolist.packages}
+    attach_maintainers(todolist.packages())
+    arches = {tp.arch for tp in todolist.packages()}
+    repos = {tp.repo for tp in todolist.packages()}
     return render(request, 'todolists/view.html', {
         'list': todolist,
         'svn_roots': svn_roots,
@@ -67,9 +73,9 @@ def list_pkgbases(request, list_id, svn_root):
     '''Used to make bulk moves of packages a lot easier.'''
     todolist = get_object_or_404(Todolist, id=list_id)
     repos = get_list_or_404(Repo, svn_root=svn_root)
-    pkgbases = {tp.pkg.pkgbase for tp in todolist.packages
-            if tp.pkg.repo in repos}
-    return HttpResponse('\n'.join(sorted(pkgbases)),
+    pkgbases = TodolistPackage.objects.values_list('pkgbase', flat=True).filter(
+            todolist=todolist, repo__in=repos).distinct().order_by('pkgbase')
+    return HttpResponse('\n'.join(pkgbases),
         mimetype='text/plain')
 
 @login_required
@@ -77,7 +83,7 @@ def todolist_list(request):
     lists = get_annotated_todolists()
     return render(request, 'todolists/list.html', {'lists': lists})
 
-@permission_required('main.add_todolist')
+@permission_required('todolists.add_todolist')
 @never_cache
 def add(request):
     if request.POST:
@@ -98,7 +104,7 @@ def add(request):
     return render(request, 'general_form.html', page_dict)
 
 # TODO: this calls for transaction management and async emailing
-@permission_required('main.change_todolist')
+@permission_required('todolists.change_todolist')
 @never_cache
 def edit(request, list_id):
     todo_list = get_object_or_404(Todolist, id=list_id)
@@ -110,7 +116,7 @@ def edit(request, list_id):
             return redirect(todo_list)
     else:
         form = TodoListForm(instance=todo_list,
-                initial={ 'packages': '\n'.join(todo_list.package_names) })
+                initial={ 'packages': todo_list.raw })
 
     page_dict = {
             'title': 'Edit Todo List: %s' % todo_list.name,
@@ -128,7 +134,7 @@ class DeleteTodolist(DeleteView):
 
 @transaction.commit_on_success
 def create_todolist_packages(form, creator=None):
-    packages = form.cleaned_data['packages']
+    packages = form.packages()
     if creator:
         # todo list is new
         todolist = form.save(commit=False)
@@ -140,18 +146,22 @@ def create_todolist_packages(form, creator=None):
         # todo list already existed
         form.save()
         todolist = form.instance
+
         # first delete any packages not in the new list
-        for todo_pkg in todolist.packages:
+        for todo_pkg in todolist.packages():
             if todo_pkg.pkg not in packages:
                 todo_pkg.delete()
 
         # save the old package list so we know what to add
-        old_packages = [p.pkg for p in todolist.packages]
+        old_packages = [todo_pkg.pkg for todo_pkg in todolist.packages()]
 
     todo_pkgs = []
     for package in packages:
         if package not in old_packages:
-            todo_pkg = TodolistPkg.objects.create(list=todolist, pkg=package)
+            todo_pkg = TodolistPackage.objects.create(todolist=todolist,
+                    pkg=package, pkgname=package.pkgname,
+                    pkgbase=package.pkgbase,
+                    arch=package.arch, repo=package.repo)
             todo_pkgs.append(todo_pkg)
 
     return todo_pkgs
@@ -186,8 +196,8 @@ def send_todolist_emails(todo_list, new_packages):
 def public_list(request):
     todo_lists = Todolist.objects.incomplete()
     # total hackjob, but it makes this a lot less query-intensive.
-    all_pkgs = [tp for tl in todo_lists for tp in tl.packages]
-    attach_maintainers([tp.pkg for tp in all_pkgs])
+    all_pkgs = [tp for tl in todo_lists for tp in tl.packages()]
+    attach_maintainers(all_pkgs)
     return render(request, "todolists/public_list.html",
             {"todo_lists": todo_lists})
 
-- 
cgit v1.2.3-54-g00ecf


From 0c94cc4465530866da7b6437975a287aa7f063a8 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 28 Dec 2012 10:06:32 -0600
Subject: Use todolist slugs for all URLs

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html |  6 +++---
 todolists/models.py           |  2 +-
 todolists/urls.py             | 29 +++++++++++++++++++----------
 todolists/views.py            | 36 ++++++++++++++++++++++--------------
 4 files changed, 45 insertions(+), 28 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 0f3475a2..66bbec6f 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -11,11 +11,11 @@ <h2>Todo List: {{ list.name }}</h2>
 
     <ul class="admin-actions">
         {% if perms.todolists.delete_todolist %}
-        <li><a href="/todo/delete/{{list.id}}/"
+        <li><a href="/todo/{{ list.slug }}/delete/"
             title="Delete this todo list">Delete Todo List</a></li>
         {% endif %}
         {% if perms.todolists.change_todolist %}
-        <li><a href="/todo/edit/{{list.id}}/"
+        <li><a href="/todo/{{ list.slug }}/edit/"
             title="Edit this todo list">Edit Todo List</a></li>
         {% endif %}
     </ul>
@@ -80,7 +80,7 @@ <h3>Filter Todo List Packages</h3>
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
                     {% if perms.todolist.change_todolistpackage %}
-                    <a href="/todo/flag/{{ list.id }}/{{ pkg.id }}/"
+                    <a href="/todo/{{ list.slug }}/flag/{{ pkg.id }}/"
                         class="status-link {{ pkg.status_css_class }}" title="Toggle completion status">{{ pkg.get_status_display }}</a>
                     {% else %}
                     <span class="{{ pkg.status_css_class }}">{{ pkg.get_status_display }}</span>
diff --git a/todolists/models.py b/todolists/models.py
index a6dda2ab..76af0d35 100644
--- a/todolists/models.py
+++ b/todolists/models.py
@@ -35,7 +35,7 @@ def __unicode__(self):
         return self.name
 
     def get_absolute_url(self):
-        return '/todo/%i/' % self.old_id
+        return '/todo/%s/' % self.slug
 
     def get_full_url(self, proto='https'):
         '''get a URL suitable for things like email including the domain'''
diff --git a/todolists/urls.py b/todolists/urls.py
index 81ac11f5..cbc9547e 100644
--- a/todolists/urls.py
+++ b/todolists/urls.py
@@ -1,17 +1,26 @@
 from django.conf.urls import patterns
-from django.contrib.auth.decorators import permission_required
+from django.contrib.auth.decorators import login_required, permission_required
 
-from .views import DeleteTodolist
+from .views import (view_redirect, view, todolist_list, add, edit, flag,
+        list_pkgbases, DeleteTodolist)
 
-urlpatterns = patterns('todolists.views',
-    (r'^$',                       'todolist_list'),
-    (r'^(?P<list_id>\d+)/$',      'view'),
-    (r'^(?P<list_id>\d+)/pkgbases/(?P<svn_root>[a-z]+)/$', 'list_pkgbases'),
-    (r'^add/$',                   'add'),
-    (r'^edit/(?P<list_id>\d+)/$', 'edit'),
-    (r'^flag/(\d+)/(\d+)/$',      'flag'),
-    (r'^delete/(?P<pk>\d+)/$',
+urlpatterns = patterns('',
+    (r'^$', login_required(todolist_list)),
+
+    # old todolists URLs, permanent redirect view so we don't break all links
+    (r'^(?P<old_id>\d+)/$', view_redirect),
+
+    (r'^add/$',
+        permission_required('todolists.add_todolist')(add)),
+    (r'^(?P<slug>[-\w]+)/$', login_required(view)),
+    (r'^(?P<slug>[-\w]+)/edit/$',
+        permission_required('todolists.change_todolist')(edit)),
+    (r'^(?P<slug>[-\w]+)/delete/$',
         permission_required('todolists.delete_todolist')(DeleteTodolist.as_view())),
+    (r'^(?P<slug>[-\w]+)/flag/(?P<pkg_id>\d+)/$',
+        permission_required('todolists.change_todolistpackage')(flag)),
+    (r'^(?P<slug>[-\w]+)/pkgbases/(?P<svn_root>[a-z]+)/$',
+        'list_pkgbases'),
 )
 
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index ccf65369..29f543c2 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -4,7 +4,6 @@
 from django.http import HttpResponse
 from django.core.mail import send_mail
 from django.shortcuts import get_list_or_404, get_object_or_404, redirect, render
-from django.contrib.auth.decorators import login_required, permission_required
 from django.db import transaction
 from django.views.decorators.cache import never_cache
 from django.views.generic import DeleteView
@@ -32,10 +31,9 @@ class Meta:
         fields = ('name', 'description', 'raw')
 
 
-@permission_required('todolists.change_todolistpackage')
 @never_cache
-def flag(request, list_id, pkg_id):
-    todolist = get_object_or_404(Todolist, old_id=list_id)
+def flag(request, slug, pkg_id):
+    todolist = get_object_or_404(Todolist, slug=slug)
     tlpkg = get_object_or_404(TodolistPackage, id=pkg_id)
     # TODO: none of this; require absolute value on submit
     if tlpkg.status == TodolistPackage.INCOMPLETE:
@@ -51,9 +49,14 @@ def flag(request, list_id, pkg_id):
         return HttpResponse(json.dumps(data), mimetype='application/json')
     return redirect(todolist)
 
-@login_required
-def view(request, list_id):
-    todolist = get_object_or_404(Todolist, old_id=list_id)
+
+def view_redirect(request, old_id):
+    todolist = get_object_or_404(Todolist, old_id=old_id)
+    return redirect(todolist, permanent=True)
+
+
+def view(request, slug):
+    todolist = get_object_or_404(Todolist, slug=slug)
     svn_roots = Repo.objects.values_list(
             'svn_root', flat=True).order_by().distinct()
     # we don't hold onto the result, but the objects are the same here,
@@ -68,22 +71,23 @@ def view(request, list_id):
         'repos': sorted(repos),
     })
 
+
 # really no need for login_required on this one...
-def list_pkgbases(request, list_id, svn_root):
+def list_pkgbases(request, slug, svn_root):
     '''Used to make bulk moves of packages a lot easier.'''
-    todolist = get_object_or_404(Todolist, old_id=list_id)
+    todolist = get_object_or_404(Todolist, slug=slug)
     repos = get_list_or_404(Repo, svn_root=svn_root)
     pkgbases = TodolistPackage.objects.values_list('pkgbase', flat=True).filter(
             todolist=todolist, repo__in=repos).distinct().order_by('pkgbase')
     return HttpResponse('\n'.join(pkgbases),
         mimetype='text/plain')
 
-@login_required
+
 def todolist_list(request):
     lists = get_annotated_todolists()
     return render(request, 'todolists/list.html', {'lists': lists})
 
-@permission_required('todolists.add_todolist')
+
 @never_cache
 def add(request):
     if request.POST:
@@ -103,11 +107,11 @@ def add(request):
     }
     return render(request, 'general_form.html', page_dict)
 
+
 # TODO: this calls for transaction management and async emailing
-@permission_required('todolists.change_todolist')
 @never_cache
-def edit(request, list_id):
-    todo_list = get_object_or_404(Todolist, old_id=list_id)
+def edit(request, slug):
+    todo_list = get_object_or_404(Todolist, slug=slug)
     if request.POST:
         form = TodoListForm(request.POST, instance=todo_list)
         if form.is_valid():
@@ -126,12 +130,14 @@ def edit(request, list_id):
     }
     return render(request, 'general_form.html', page_dict)
 
+
 class DeleteTodolist(DeleteView):
     model = Todolist
     # model in main == assumes name 'main/todolist_confirm_delete.html'
     template_name = 'todolists/todolist_confirm_delete.html'
     success_url = '/todo/'
 
+
 @transaction.commit_on_success
 def create_todolist_packages(form, creator=None):
     packages = form.packages()
@@ -166,6 +172,7 @@ def create_todolist_packages(form, creator=None):
 
     return todo_pkgs
 
+
 def send_todolist_emails(todo_list, new_packages):
     '''Sends emails to package maintainers notifying them that packages have
     been added to a todo list.'''
@@ -193,6 +200,7 @@ def send_todolist_emails(todo_list, new_packages):
                 [maint],
                 fail_silently=True)
 
+
 def public_list(request):
     todo_lists = Todolist.objects.incomplete()
     # total hackjob, but it makes this a lot less query-intensive.
-- 
cgit v1.2.3-54-g00ecf


From ee507a5b81d7a21eaa67da4c848522a5a97d2e3c Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Fri, 28 Dec 2012 14:44:09 -0600
Subject: Add a todolist package details link template tag

Given the way we retrieve certain related objects, it makes more sense
to use a custom tag here rather than our generic package details link
tag. When viewing a large todolist, this saves significantly on the
number of queries we need to build the page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/devel/index.html           |  3 ++-
 templates/todolists/public_list.html |  4 ++--
 templates/todolists/view.html        |  4 ++--
 todolists/templatetags/__init__.py   |  0
 todolists/templatetags/todolists.py  | 19 +++++++++++++++++++
 5 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 todolists/templatetags/__init__.py
 create mode 100644 todolists/templatetags/todolists.py

(limited to 'templates/todolists/view.html')

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 57151041..6d304409 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -2,6 +2,7 @@
 {% load static from staticfiles %}
 {% load cache %}
 {% load package_extras %}
+{% load todolists %}
 
 {% block title %}Arch Linux - Developer Dashboard{% endblock %}
 
@@ -61,7 +62,7 @@ <h3>My Incomplete Todo List Packages</h3>
                 <tr class="{% cycle 'odd' 'even' %}">
                     <td><a href="{{ todopkg.todolist.get_absolute_url }}"
                             title="View todo list: {{ todopkg.todolist.name }}">{{ todopkg.todolist.name }}</a></td>
-                    <td>{% pkg_details_link todopkg.pkg %}</td>
+                    <td>{% todopkg_details_link todopkg %}</td>
                     <td>{{ todopkg.repo.name }}</td>
                     <td>{{ todopkg.arch.name }}</td>
                     <td>{{ todopkg.pkg.maintainers|join:', ' }}</td>
diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
index 41caf5b0..da99bc01 100644
--- a/templates/todolists/public_list.html
+++ b/templates/todolists/public_list.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load package_extras %}
+{% load todolists %}
 
 {% block title %}Arch Linux - Todo Lists{% endblock %}
 
@@ -45,7 +45,7 @@ <h4>{{ list.name }}</h4>
                 <tbody>
                     {% for pkg in list.packages %}
                     <tr class="{% cycle 'odd' 'even' %}">
-                        <td>{% pkg_details_link pkg.pkg pkg.pkgname %}</td>
+                        <td>{% todopkg_details_link pkg %}</td>
                         <td>{{ pkg.arch.name }}</td>
                         <td>{{ pkg.repo.name|capfirst }}</td>
                         <td>{{ pkg.maintainers|join:', ' }}</td>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 66bbec6f..89a05126 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,6 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
-{% load package_extras %}
+{% load todolists %}
 
 {% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
 
@@ -71,7 +71,7 @@ <h3>Filter Todo List Packages</h3>
             <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>
+                <td>{% todopkg_details_link pkg %}</td>
                 {% if pkg.pkg.flag_date %}
                 <td><span class="flagged">{{ pkg.pkg.full_version }}</span></td>
                 {% else %}
diff --git a/todolists/templatetags/__init__.py b/todolists/templatetags/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/todolists/templatetags/todolists.py b/todolists/templatetags/todolists.py
new file mode 100644
index 00000000..5f31dc1f
--- /dev/null
+++ b/todolists/templatetags/todolists.py
@@ -0,0 +1,19 @@
+from django import template
+
+register = template.Library()
+
+
+def pkg_absolute_url(repo, arch, pkgname):
+    return '/packages/%s/%s/%s/' % (repo.name.lower(), arch.name, pkgname)
+
+
+@register.simple_tag
+def todopkg_details_link(todopkg):
+    pkg = todopkg.pkg
+    if not pkg:
+        return todopkg.pkgname
+    link = '<a href="%s" title="View package details for %s">%s</a>'
+    url = pkg_absolute_url(todopkg.repo, todopkg.arch, pkg.pkgname)
+    return link % (url, pkg.pkgname, pkg.pkgname)
+
+# vim: set ts=4 sw=4 et:
-- 
cgit v1.2.3-54-g00ecf


From 87f39ff65904817c0e0ab12681157e6b1494a813 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 31 Dec 2012 00:13:25 -0600
Subject: Fix todolist permission typo

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 89a05126..86221127 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -79,7 +79,7 @@ <h3>Filter Todo List Packages</h3>
                 {% endif %}
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
-                    {% if perms.todolist.change_todolistpackage %}
+                    {% if perms.todolists.change_todolistpackage %}
                     <a href="/todo/{{ list.slug }}/flag/{{ pkg.id }}/"
                         class="status-link {{ pkg.status_css_class }}" title="Toggle completion status">{{ pkg.get_status_display }}</a>
                     {% else %}
-- 
cgit v1.2.3-54-g00ecf


From e9e1c071654edd7b95e20c8105abbc23f426cecc Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 22 Jan 2013 16:47:43 -0600
Subject: Show staging version on todolist view page

If one exists, it is easy enough to show it here so in-progress
todolists can easily be cross-checked with the current state of the
repository.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html |  5 +++++
 todolists/utils.py            | 19 +++++++++++++++++++
 todolists/views.py            |  3 ++-
 3 files changed, 26 insertions(+), 1 deletion(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 86221127..e544fa12 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load package_extras %}
 {% load todolists %}
 
 {% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
@@ -62,6 +63,7 @@ <h3>Filter Todo List Packages</h3>
                 <th>Repository</th>
                 <th>Name</th>
                 <th>Current Version</th>
+                <th>Staging Version</th>
                 <th>Maintainers</th>
                 <th>Status</th>
             </tr>
@@ -77,6 +79,9 @@ <h3>Filter Todo List Packages</h3>
                 {% else %}
                 <td>{{ pkg.pkg.full_version }}</td>
                 {% endif %}
+                {% with staging=pkg.staging %}
+                <td>{% pkg_details_link staging staging.full_version %}</td>
+                {% endwith %}
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
                     {% if perms.todolists.change_todolistpackage %}
diff --git a/todolists/utils.py b/todolists/utils.py
index e86d9054..51a75a3c 100644
--- a/todolists/utils.py
+++ b/todolists/utils.py
@@ -2,6 +2,7 @@
 from django.db.models import Count
 
 from .models import Todolist, TodolistPackage
+from packages.models import Package
 
 
 def todo_counts():
@@ -36,4 +37,22 @@ def get_annotated_todolists(incomplete_only=False):
 
     return lists
 
+
+def attach_staging(packages, list_id):
+    '''Look for any staging version of the packages provided and attach them
+    to the 'staging' attribute on each package if found.'''
+    pkgnames = TodolistPackage.objects.filter(
+            todolist_id=list_id).values('pkgname')
+    staging_pkgs = Package.objects.normal().filter(repo__staging=True,
+            pkgname__in=pkgnames)
+    # now build a lookup dict to attach to the correct package
+    lookup = {(p.pkgname, p.arch): p for p in staging_pkgs}
+
+    annotated = []
+    for package in packages:
+        in_staging = lookup.get((package.pkgname, package.arch), None)
+        package.staging = in_staging
+
+    return annotated
+
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index fcf62e23..f333728a 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -16,7 +16,7 @@
 from main.utils import find_unique_slug
 from packages.utils import attach_maintainers
 from .models import Todolist, TodolistPackage
-from .utils import get_annotated_todolists
+from .utils import get_annotated_todolists, attach_staging
 
 
 class TodoListForm(forms.ModelForm):
@@ -69,6 +69,7 @@ def view(request, slug):
     # we don't hold onto the result, but the objects are the same here,
     # so accessing maintainers in the template is now cheap
     attach_maintainers(todolist.packages())
+    attach_staging(todolist.packages(), todolist.pk)
     arches = {tp.arch for tp in todolist.packages()}
     repos = {tp.repo for tp in todolist.packages()}
     return render(request, 'todolists/view.html', {
-- 
cgit v1.2.3-54-g00ecf


From 44dde6f02f649244d7c1b9dcf03d8ce592bbbbcb Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sun, 27 Jan 2013 09:44:38 -0600
Subject: Fix todolist maintainer sorting

And also fix up a place where we dereferenced a variable in a template
that doesn't exist.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index e544fa12..934e3ae8 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -80,7 +80,7 @@ <h3>Filter Todo List Packages</h3>
                 <td>{{ pkg.pkg.full_version }}</td>
                 {% endif %}
                 {% with staging=pkg.staging %}
-                <td>{% pkg_details_link staging staging.full_version %}</td>
+                <td>{% if staging %}{% pkg_details_link staging staging.full_version %}{% endif %}</td>
                 {% endwith %}
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
@@ -103,7 +103,7 @@ <h3>Filter Todo List Packages</h3>
     $(".results").tablesorter({
         widgets: ['zebra'],
         sortList: [[2,0], [0,0]],
-        headers: { 5: { sorter: 'todostatus' } }
+        headers: { 6: { sorter: 'todostatus' } }
     });
 });
 $(document).ready(function() {
-- 
cgit v1.2.3-54-g00ecf


From 839371f3f8a7b6de199c48735098567db297928a Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 28 Jan 2013 23:00:18 -0600
Subject: Fix missing template variable for removed todolist packages

When there was no longer an attached package, running in template debug
mode showed we were trying to dereference a variable that didn't exist.
Fix the issue by adding a bit more to the if conditional block.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 934e3ae8..1b9a9e37 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -76,8 +76,10 @@ <h3>Filter Todo List Packages</h3>
                 <td>{% todopkg_details_link pkg %}</td>
                 {% if pkg.pkg.flag_date %}
                 <td><span class="flagged">{{ pkg.pkg.full_version }}</span></td>
-                {% else %}
+                {% elif pkg.pkg %}
                 <td>{{ pkg.pkg.full_version }}</td>
+                {% else %}
+                <td></td>
                 {% endif %}
                 {% with staging=pkg.staging %}
                 <td>{% if staging %}{% pkg_details_link staging staging.full_version %}{% endif %}</td>
-- 
cgit v1.2.3-54-g00ecf


From 6172b6dd09f932de8db7ab69641370d78d25a4c2 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 11 Mar 2013 18:48:29 -0500
Subject: Make todolists fully public

Remove the login_required decorator from the index and detail views to
allow everyone to see the same thing. Of course, when I say "same" here,
unauthenticated users don't see the same links developers do to mark
packages complete and incomplete.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/view.html | 2 ++
 todolists/urls.py             | 6 +++---
 2 files changed, 5 insertions(+), 3 deletions(-)

(limited to 'templates/todolists/view.html')

diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 1b9a9e37..a96297cf 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -45,8 +45,10 @@ <h3>Filter Todo List Packages</h3>
             <div><label for="id_repo_{{ repo.name|lower }}" title="Target Repository {{ repo.name }}">[{{ repo.name|lower }}]</label>
                 <input type="checkbox" name="repo_{{ repo.name|lower }}" id="id_repo_{{ repo.name|lower }}" class="repo_filter" value="{{ repo.name|lower }}" checked="checked"/></div>
             {% endfor %}
+            {% if user.is_authenticated %}
             <div><label for="id_mine_only" title="Show only packages maintained by me">Only Mine</label>
                 <input type="checkbox" name="mine_only" id="id_mine_only" value="mine_only"/></div>
+            {% endif %}
             <div><label for="id_incomplete" title="Packages not yet completed">Only Incomplete</label>
                 <input type="checkbox" name="incomplete" id="id_incomplete" value="incomplete"/></div>
             <div ><label>&nbsp;</label><input title="Reset search criteria" type="button" id="criteria_reset" value="Reset"/></div>
diff --git a/todolists/urls.py b/todolists/urls.py
index a4f93da7..6617d7dd 100644
--- a/todolists/urls.py
+++ b/todolists/urls.py
@@ -1,18 +1,18 @@
 from django.conf.urls import patterns
-from django.contrib.auth.decorators import login_required, permission_required
+from django.contrib.auth.decorators import permission_required
 
 from .views import (view_redirect, view, todolist_list, add, edit, flag,
         list_pkgbases, DeleteTodolist)
 
 urlpatterns = patterns('',
-    (r'^$', login_required(todolist_list)),
+    (r'^$', todolist_list),
 
     # old todolists URLs, permanent redirect view so we don't break all links
     (r'^(?P<old_id>\d+)/$', view_redirect),
 
     (r'^add/$',
         permission_required('todolists.add_todolist')(add)),
-    (r'^(?P<slug>[-\w]+)/$', login_required(view)),
+    (r'^(?P<slug>[-\w]+)/$', view),
     (r'^(?P<slug>[-\w]+)/edit/$',
         permission_required('todolists.change_todolist')(edit)),
     (r'^(?P<slug>[-\w]+)/delete/$',
-- 
cgit v1.2.3-54-g00ecf