From 00b9084303ccb27f7937a9392d2a582d25a04288 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Mon, 11 Mar 2013 18:23:59 -0500
Subject: Remove public todolists view

Replace this with a redirect to the developer todolist index page.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/todolists/public_list.html | 69 ------------------------------------
 todolists/views.py                   | 10 ------
 urls.py                              |  2 +-
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 templates/todolists/public_list.html

diff --git a/templates/todolists/public_list.html b/templates/todolists/public_list.html
deleted file mode 100644
index da99bc01..00000000
--- a/templates/todolists/public_list.html
+++ /dev/null
@@ -1,69 +0,0 @@
-{% extends "base.html" %}
-{% load static from staticfiles %}
-{% load todolists %}
-
-{% block title %}Arch Linux - Todo Lists{% endblock %}
-
-{% block content %}
-<div class="box">
-    <h2>Developer Todo Lists</h2>
-    <div id="public_todo_lists_toc">
-        <h3>Open Developer Todo Lists</h3>
-        <p>Todo lists are used by the developers when a rebuild of a set of
-        packages is needed. This is common when a library has an .so version
-        bump; during a toolchain rebuild, or a general cleanup of packages in
-        the repositories. The progress can be tracked here. Only todo lists
-        with currently incomplete packages are shown.</p>
-        {% if todo_lists %}<ul>
-            {% for list in todo_lists %}
-            <li><a href="#{{ list.id }}">{{ list.name }}</a></li>
-            {% endfor %}
-        </ul>{% else %}
-        <p>There are currently no incomplete developer todo lists.</p>
-        {% endif %}
-    </div>
-</div>
-{% if todo_lists %}
-<div id="public-todo-lists">
-    {% for list in todo_lists %}
-    <div class="box">
-        <div class="todo-list">
-            <a name="{{ list.id }}"></a>
-            <h4>{{ list.name }}</h4>
-            <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>
-                    <tr>
-                        <th>Name</th>
-                        <th>Arch</th>
-                        <th>Repo</th>
-                        <th>Maintainer</th>
-                        <th>Status</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for pkg in list.packages %}
-                    <tr class="{% cycle 'odd' 'even' %}">
-                        <td>{% todopkg_details_link pkg %}</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>
-            </table>
-        </div>
-    </div>
-    {% endfor %}
-</div>
-{% endif %}
-{% load cdn %}{% jquery %}{% jquery_tablesorter %}
-<script type="text/javascript" src="{% static "archweb.js" %}"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[0,0], [1,0]]});
-});
-</script>
-{% endblock %}
diff --git a/todolists/views.py b/todolists/views.py
index 4b4a4dd2..abec9253 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -230,14 +230,4 @@ def send_todolist_emails(todo_list, new_packages):
                 [maint],
                 fail_silently=True)
 
-
-def public_list(request):
-    todo_lists = Todolist.objects.incomplete().defer(
-            'raw').order_by('-created')
-    # 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(all_pkgs)
-    return render(request, "todolists/public_list.html",
-            {"todo_lists": todo_lists})
-
 # vim: set ts=4 sw=4 et:
diff --git a/urls.py b/urls.py
index 4d9db162..79838ce3 100644
--- a/urls.py
+++ b/urls.py
@@ -71,7 +71,6 @@ urlpatterns += patterns('',
         {}, 'opensearch-packages'),
     (r'^opensearch/packages/suggest$', 'packages.views.opensearch_suggest',
         {}, 'opensearch-packages-suggest'),
-    (r'^todolists/$','todolists.views.public_list'),
 )
 
 # Retro home page views
@@ -109,6 +108,7 @@ legacy_urls = (
     ('^news.php',      '/news/'),
     ('^packages.php',  '/packages/'),
     ('^people.php',    '/developers/'),
+    ('^todolists/$',   '/todo/'),
 
     ('^docs/en/guide/install/arch-install-guide.html',
         'https://wiki.archlinux.org/index.php/Installation_Guide'),
-- 
cgit v1.2.3-55-g3dc8