Merge lp:~bigkevmcd/offspring/upgrade-to-django15 into lp:offspring

[Kevin McDermott]

This does the bare minimum required to limp forward to Django 1.5.5

Replacing the removed function-based generic views with CBV, and...fixing piston by dropping it's use of simplejson for the default system json (this is in the django-piston-0.2.2lexbuild2.tar.gz tarball).

I've only done a basic start-up and click around a bit, and things like the ISC tables for lists of builds etc seem to be working (along with the list of pages).

[Nicola Heald (notnownikki)]

+1 looks like it works to me

review: Approve

=== modified file 'lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py'
--- lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py	2013-06-05 17:37:21 +0000
+++ lib/offspring/web/queuemanager/management/commands/tests/test_build_metrics.py	2014-01-10 10:20:42 +0000
@@ -53,44 +53,33 @@
         If --start is provided without --end, then we should get an
         appropriate error.
         """
-        exit_mock = self.mocker.replace("sys.exit")
-        exit_mock(1)
-        self.mocker.replay()
-
         command = Command()
         stderr = StringIO()
-        command.execute(start="2013-06-05", stderr=stderr)
-
-        self.assertTrue(
-            "Error: --start and --end must be supplied" in stderr.getvalue())
+        with self.assertRaises(CommandError) as cm:
+            command.execute(start="2013-06-05", stderr=stderr)
+        self.assertEqual("--start and --end must be supplied",
+                         str(cm.exception))
 
     def test_error_with_missing_start_parameters(self):
         """
         If --end is provided without --start, then we should get an
         appropriate error.
         """
-        exit_mock = self.mocker.replace("sys.exit")
-        exit_mock(1)
-        self.mocker.replay()
-
         command = Command()
         stderr = StringIO()
-        command.execute(end="2013-06-05", stderr=stderr)
-
-        self.assertTrue(
-            "Error: --start and --end must be supplied" in stderr.getvalue())
+        with self.assertRaises(CommandError) as cm:
+            command.execute(end="2013-06-05", stderr=stderr)
+        self.assertEqual("--start and --end must be supplied",
+                         str(cm.exception))
 
     def test_error_with_end_before_start(self):
         """
         If the end date is not before the start datae we should get an error.
         """
-        exit_mock = self.mocker.replace("sys.exit")
-        exit_mock(1)
-        self.mocker.replay()
-
         command = Command()
         stderr = StringIO()
-        command.execute(start="2013-06-05", end="2013-05-05", stderr=stderr)
 
-        self.assertTrue(
-            "Error: start date must be before end date" in stderr.getvalue())
+        with self.assertRaises(CommandError) as cm:
+            command.execute(start="2013-06-05", end="2013-05-05", stderr=stderr)
+        self.assertEqual("start date must be before end date",
+                         str(cm.exception))

=== modified file 'lib/offspring/web/queuemanager/models.py'
--- lib/offspring/web/queuemanager/models.py	2013-10-24 11:22:51 +0000
+++ lib/offspring/web/queuemanager/models.py	2014-01-10 10:20:42 +0000
@@ -464,7 +464,7 @@
     created_at = models.DateTimeField('date created', auto_now_add=True)
     updated_at = models.DateTimeField('date updated', auto_now=True)
     published_at = models.DateTimeField('date published', null=True, editable=False)
-    checklist_url = models.URLField('checklist URL', verify_exists=False, blank=True)
+    checklist_url = models.URLField('checklist URL', blank=True)
     notes = models.TextField('release notes', blank=True)
     status = models.PositiveSmallIntegerField(choices=STATUS_CHOICES, default=STATUS_PENDING)
 

=== modified file 'lib/offspring/web/queuemanager/tests/test_metrics.py'
--- lib/offspring/web/queuemanager/tests/test_metrics.py	2013-06-06 09:45:19 +0000
+++ lib/offspring/web/queuemanager/tests/test_metrics.py	2014-01-10 10:20:42 +0000
@@ -197,11 +197,11 @@
         """
         with self.assertRaises(ValueError) as cm:
             calculate_start_and_end("TESTING", "2013-06-05")
-        self.assertEqual(cm.exception.message, "Invalid start date TESTING")
+        self.assertEqual("Invalid start date TESTING", str(cm.exception))
 
         with self.assertRaises(ValueError) as cm:
             calculate_start_and_end("2013-06-05", "TESTING")
-        self.assertEqual(cm.exception.message, "Invalid end date TESTING")
+        self.assertEqual("Invalid end date TESTING", str(cm.exception))
 
     def test_calculate_days(self):
         """

=== modified file 'lib/offspring/web/queuemanager/tests/test_views.py'
--- lib/offspring/web/queuemanager/tests/test_views.py	2013-10-24 09:42:39 +0000
+++ lib/offspring/web/queuemanager/tests/test_views.py	2014-01-10 10:20:42 +0000
@@ -206,8 +206,7 @@
     def setUp(self):
         self.project = factory.make_project()
         self.view_url = reverse(
-            'offspring.web.queuemanager.views.project_edit',
-            args=[self.project.name])
+            'project_edit', kwargs={'projectName': self.project.name})
         self.user = factory.make_user()
         p = Permission.objects.get(codename="change_project")
         self.user.user_permissions.add(p)
@@ -275,6 +274,7 @@
             msg_prefix=response.content
         )
 
+
 class BuildersListViewTests(TestCase):
     def setUp(self):
         user = factory.make_user()
@@ -296,6 +296,7 @@
             response, self.builder2.name, status_code=200,
             msg_prefix=response.content)
 
+
 class BuilderDetailsViewTests(TestCase):
     def setUp(self):
         user = factory.make_user()
@@ -314,6 +315,7 @@
         response = self.client.get(reverse("builder_details", kwargs={'slug': self.builder2.name}))
         self.assertEqual(response.status_code, 200)
 
+
 class BuildResultPublishViewTests(TestCase):
 
     def test_buildresult_publish_view(self):
@@ -525,8 +527,7 @@
 class CreateProjectTests(TestCase):
 
     def setUp(self):
-        self.view_url = reverse(
-            "offspring.web.queuemanager.views.project_create")
+        self.view_url = reverse("project_create")
         self.user = factory.make_user()
 
     def test_get_project_form_filters_projects_groups_for_user(self):

=== modified file 'lib/offspring/web/queuemanager/views.py'
--- lib/offspring/web/queuemanager/views.py	2013-10-10 15:23:03 +0000
+++ lib/offspring/web/queuemanager/views.py	2014-01-10 10:20:42 +0000
@@ -30,14 +30,7 @@
     Template
 )
 from django.utils.html import escape
-from django.views.generic.create_update import (
-    create_object,
-    update_object
-)
-from django.views.generic.list_detail import (
-    object_list,
-    object_detail
-)
+from django.views.generic import UpdateView, ListView, DetailView, CreateView
 
 from django_group_access.models import AccessGroup
 from pygooglechart import PieChart3D
@@ -52,16 +45,9 @@
     ReleaseForm,
 )
 from offspring.web.queuemanager.models import (
-    BuildRequest,
-    BuildResult,
-    LaunchpadProjectMilestone,
-    Project,
-    ProjectGroup,
-    Release,
-    get_updated_builders,
-    get_completed_builds,
-    get_failed_builds,
-)
+    BuildRequest, BuildResult, LaunchpadProjectMilestone,
+    Project, ProjectGroup, Release, get_updated_builders,
+    get_completed_builds, get_failed_builds, Lexbuilder)
 
 
 config = get_configuration()
@@ -179,31 +165,6 @@
     else:
         return HttpResponseForbidden(render_to_response('403.html'))
 
-def project_create(request):
-    return create_object(
-        request,
-        form_class=CreateProjectForm, 
-        login_required=True,
-        template_name='queuemanager/project_create.html',
-        extra_context={ 'pillar' : 'projects' },
-    )
-project_create = permission_required('queuemanager.add_project')(project_create)
-
-def project_edit(request, projectName):
-    pageData = {
-        'pillar': 'projects',
-    }
-
-    return update_object(
-        request,
-        form_class=EditProjectForm,
-        login_required=True,
-        template_name='queuemanager/project_edit.html',
-        template_object_name='project',
-        extra_context=pageData,
-        object_id=projectName,
-    )
-project_edit = permission_required('queuemanager.change_project')(project_edit)
 
 def project_details(request, projectName):
     p = get_object_or_404(
@@ -429,3 +390,59 @@
     hours = int(request.GET.get("hours", 1))
     return HttpResponse(
         str(get_failed_builds(timedelta(hours=hours)).count()))
+
+
+
+class ProjectEditView(UpdateView):
+    form_class = EditProjectForm
+    model = Project
+    template_name = 'queuemanager/project_edit.html'
+    context_object_name = 'project'
+    pk_url_kwarg = 'projectName'
+
+    def get_context_data(self, **kwargs):
+        context = super(ProjectEditView, self).get_context_data(**kwargs)
+        context['pillar'] = 'projects'
+        return context
+
+
+class BuilderListView(ListView):
+
+    template_name = 'queuemanager/builders.html'
+    context_object_name = 'builder_list'
+
+    def get_context_data(self, **kwargs):
+        context = super(BuilderListView, self).get_context_data(**kwargs)
+        context['pillar'] = 'builders'
+        return context
+
+    def get_queryset(self):
+        return Lexbuilder.objects.filter(is_retired=False).order_by(
+             "-is_active", "-machine_type", "-created_at")
+
+
+class BuilderDetailView(DetailView):
+
+    slug_field = 'name'
+    template_name = 'queuemanager/builder_details.html'
+    context_object_name = 'builder'
+
+    def get_context_data(self, **kwargs):
+        context = super(BuilderDetailView, self).get_context_data(**kwargs)
+        context['pillar'] = 'builders'
+        return context
+
+    def get_queryset(self):
+        return Lexbuilder.objects.filter(is_retired=False)
+
+
+class ProjectCreateView(CreateView):
+
+    form_class = CreateProjectForm
+    model = Project
+    template_name = 'queuemanager/project_create.html'
+
+    def get_context_data(self, **kwargs):
+        context = super(ProjectCreateView, self).get_context_data(**kwargs)
+        context['pillar'] = 'projects'
+        return context

=== modified file 'lib/offspring/web/settings_test.py'
--- lib/offspring/web/settings_test.py	2011-12-12 22:26:43 +0000
+++ lib/offspring/web/settings_test.py	2014-01-10 10:20:42 +0000
@@ -5,8 +5,11 @@
 
 DATABASES = {
     'default': {
-        'NAME': 'test_db',
-        'ENGINE': 'django.db.backends.sqlite3',
+        'NAME': 'offspring',
+        'ENGINE': 'django.db.backends.postgresql_psycopg2',
+        'HOST': 'localhost',
+        'USER': 'offspring',
+        'PASSWORD': 'temp1234',
     }
 }
 

=== modified file 'lib/offspring/web/templates/queuemanager/build_details.html'
--- lib/offspring/web/templates/queuemanager/build_details.html	2012-05-25 03:43:55 +0000
+++ lib/offspring/web/templates/queuemanager/build_details.html	2014-01-10 10:20:42 +0000
@@ -29,7 +29,7 @@
 <h1>Build Details</h1>
 <dl>
     <dt>Project:</dt>
-    <dd><a href="{% url offspring.web.queuemanager.views.project_details project.name %}">{{project.name}}</a></dd>
+    <dd><a href="{% url 'offspring.web.queuemanager.views.project_details' project.name %}">{{project.name}}</a></dd>
 </dl>
 
 <dl>
@@ -49,7 +49,7 @@
 
 <dl>
     <dt>Builder:</dt>
-    <dd><a href="{% url builder_details build.builder %}">{{build.builder.name}}</a></dd>
+    <dd><a href="{% url 'builder_details' build.builder %}">{{build.builder.name}}</a></dd>
 </dl>
 
 <dl>

=== modified file 'lib/offspring/web/templates/queuemanager/build_publish.html'
--- lib/offspring/web/templates/queuemanager/build_publish.html	2010-11-29 08:27:24 +0000
+++ lib/offspring/web/templates/queuemanager/build_publish.html	2014-01-10 10:20:42 +0000
@@ -25,7 +25,7 @@
             {% endfor %}
             <div class="submit-row" style="overflow: auto;">
                 <input type="submit" value="Save" class="default" name="_save"/>
-                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
+                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url 'offspring.web.queuemanager.views.project_details' project.name %}';"/>
             </div>
         </div>
     </form>

=== modified file 'lib/offspring/web/templates/queuemanager/builders.html'
--- lib/offspring/web/templates/queuemanager/builders.html	2013-08-16 14:44:35 +0000
+++ lib/offspring/web/templates/queuemanager/builders.html	2014-01-10 10:20:42 +0000
@@ -15,7 +15,7 @@
     {% for builder in builder_list %}
         <tr height="20px">
             <td>
-                <a class="{% if builder.is_active %}{% if builder.is_okay %}{% ifequal builder.current_state "BUILDING" %}busy{% else %}online{% endifequal %}{% else %}problem{% endif %}{% else %}offline{% endif %}" href="{% url builder_details builder %}">{{builder.name}}</a>
+                <a class="{% if builder.is_active %}{% if builder.is_okay %}{% ifequal builder.current_state "BUILDING" %}busy{% else %}online{% endifequal %}{% else %}problem{% endif %}{% else %}offline{% endif %}" href="{% url 'builder_details' builder %}">{{builder.name}}</a>
             </td>
             <td align="center">
                 <a style="margin-left: 10px;">{% if builder.is_active %}<img src="/assets/images/10.png" title="Builder Active"/>{% else %}<img src="/assets/images/12.png" title="Builder Deactivated"/>{% endif %}</a>
@@ -32,7 +32,7 @@
             </td>
             <td align="center"> 
             {% if builder.current_build_projectname %}
-                <a href="{% url offspring.web.queuemanager.views.project_details builder.current_build_projectname %}">{{builder.current_build_projectname}}</a> (<a href="{{builder.current_build_projectname|link_results:builder.current_build_buildname}}">{{builder.current_build_buildname}}</a>)
+                <a href="{% url 'offspring.web.queuemanager.views.project_details' builder.current_build_projectname %}">{{builder.current_build_projectname}}</a> (<a href="{{builder.current_build_projectname|link_results:builder.current_build_buildname}}">{{builder.current_build_buildname}}</a>)
             {% endif %}    
             </td>
             <td>

=== modified file 'lib/offspring/web/templates/queuemanager/builds.html'
--- lib/offspring/web/templates/queuemanager/builds.html	2013-10-24 09:42:39 +0000
+++ lib/offspring/web/templates/queuemanager/builds.html	2014-01-10 10:20:42 +0000
@@ -31,13 +31,13 @@
                 {% endifequal %}
             </td>
             <td>
-                <a title="View project details" href="{% url offspring.web.queuemanager.views.project_details build_result.project.name %}">
+                <a title="View project details" href="{% url 'offspring.web.queuemanager.views.project_details' build_result.project.name %}">
                     {{ build_result.project.title }}
                 </a>
             </td>
             <td>
                 {% if build_result.name %}
-                    <a href="{% url offspring.web.queuemanager.views.build_details build_result.project.name build_result.name %}" title="View build details">
+                    <a href="{% url 'offspring.web.queuemanager.views.build_details' build_result.project.name build_result.name %}" title="View build details">
                     {{ build_result.name }}
                     </a>
                 {% endif %}
@@ -66,7 +66,7 @@
                 {% endif %}
             </td>
             <td>
-                <a href="{% url builder_details build_result.builder %}">{{ build_result.builder.name }}</a>
+                <a href="{% url 'builder_details' build_result.builder %}">{{ build_result.builder.name }}</a>
             </td>
         </tr>
     {% endfor %}

=== modified file 'lib/offspring/web/templates/queuemanager/project_details.html'
--- lib/offspring/web/templates/queuemanager/project_details.html	2013-07-04 19:45:29 +0000
+++ lib/offspring/web/templates/queuemanager/project_details.html	2014-01-10 10:20:42 +0000
@@ -175,13 +175,13 @@
             width: 640,
         }),
         isc.HTMLPane.create({
-            contentsURL:"{% url offspring.web.queuemanager.views.project_development_sourcesList project.name %}?action=view",
+            contentsURL:"{% url 'offspring.web.queuemanager.views.project_development_sourcesList' project.name %}?action=view",
             autoDraw: false,
             width: 640,
             height: 75,
         }),
         isc.HTMLFlow.create({
-            contents: "<div id=\"sourcesListModalContent\"><p><b><a class=\"install\" href=\"{% url offspring.web.queuemanager.views.project_development_sourcesList project.name %}\">Install this sources.list</a></b></p><p style=\"line-height: normal;font-size: 0.85em;\">Please be aware that you must install the <em><a href=\"apt:apt-transport-https\">apt-transport-https</a></em> package for apt to support communications over https.</p></div>",
+            contents: "<div id=\"sourcesListModalContent\"><p><b><a class=\"install\" href=\"{% url 'offspring.web.queuemanager.views.project_development_sourcesList' project.name %}\">Install this sources.list</a></b></p><p style=\"line-height: normal;font-size: 0.85em;\">Please be aware that you must install the <em><a href=\"apt:apt-transport-https\">apt-transport-https</a></em> package for apt to support communications over https.</p></div>",
             autoDraw: false,
             padding: 8,
             width: 640,
@@ -211,7 +211,7 @@
             padding: 10,
             numCols: 3,
             canSubmit: true,
-            action: "{% url offspring.web.queuemanager.views.queue_build project.name %}",
+            action: "{% url 'offspring.web.queuemanager.views.queue_build' project.name %}",
             fields: [
                 {
                     name: "build_reason",
@@ -491,7 +491,7 @@
             icon: "/assets/images/pencil.png",
             prompt: "Update project details",
             click: function() {
-                window.location.href = "{% url project_edit project.name %}";
+                window.location.href = "{% url 'project_edit' project.name %}";
                 return false;
             },
         }),

=== modified file 'lib/offspring/web/templates/queuemanager/project_edit.html'
--- lib/offspring/web/templates/queuemanager/project_edit.html	2012-06-08 03:36:15 +0000
+++ lib/offspring/web/templates/queuemanager/project_edit.html	2014-01-10 10:20:42 +0000
@@ -54,7 +54,7 @@
             {% endfor %}
             <div class="submit-row" style="overflow: auto;">
                 <input type="submit" value="Save" class="default" name="_save"/>
-                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url offspring.web.queuemanager.views.project_details project.name %}';"/>
+                <input type="button" value="Cancel" class="default" name="_cancel" OnClick="window.location.href = '{% url 'offspring.web.queuemanager.views.project_details' project.name %}';"/>
             </div>
         </div>
     </form>

=== modified file 'lib/offspring/web/templates/queuemanager/projectgroup_details.html'
--- lib/offspring/web/templates/queuemanager/projectgroup_details.html	2013-07-04 19:45:29 +0000
+++ lib/offspring/web/templates/queuemanager/projectgroup_details.html	2014-01-10 10:20:42 +0000
@@ -39,10 +39,10 @@
     {% for project in projectGroup.projects %}
     <tr>
         <td>
-            {% if project.needs_build %}<img src="/assets/images/alarm-clock-select-remain.png" title="Pending Build">{% else %}{% ifequal project.latest_build.result "FAILED" %}<img src="/assets/images/exclamation.png" title="Build Failure">{% else %} {% ifequal project.latest_build.result "COMPLETED" %} <img src="/assets/images/10.png" title="Build Successful"> {% else %} <img src="/assets/images/9.png" title="Not yet built">{% endifequal %}{% endifequal %}{% endif %}</td><td> <a href="{% url offspring.web.queuemanager.views.project_details project.name %}">{{ project.title }}</a>
+            {% if project.needs_build %}<img src="/assets/images/alarm-clock-select-remain.png" title="Pending Build">{% else %}{% ifequal project.latest_build.result "FAILED" %}<img src="/assets/images/exclamation.png" title="Build Failure">{% else %} {% ifequal project.latest_build.result "COMPLETED" %} <img src="/assets/images/10.png" title="Build Successful"> {% else %} <img src="/assets/images/9.png" title="Not yet built">{% endifequal %}{% endifequal %}{% endif %}</td><td> <a href="{% url 'offspring.web.queuemanager.views.project_details' project.name %}">{{ project.title }}</a>
             </td>
             <td>
-                {% if project.latest_build %} <a href="{% url offspring.web.queuemanager.views.build_details project.name project.latest_build.name %}" title="View build details">{{ project.latest_build.name }}</a>{% endif %}
+                {% if project.latest_build %} <a href="{% url 'offspring.web.queuemanager.views.build_details' project.name project.latest_build.name %}" title="View build details">{{ project.latest_build.name }}</a>{% endif %}
         </td>
         <td>
             {{ project.latest_build_date }}

=== modified file 'lib/offspring/web/templates/queuemanager/projects.html'
--- lib/offspring/web/templates/queuemanager/projects.html	2013-07-04 19:45:29 +0000
+++ lib/offspring/web/templates/queuemanager/projects.html	2014-01-10 10:20:42 +0000
@@ -39,7 +39,7 @@
                 {% if project.needs_build %}<img src="/assets/images/alarm-clock-select-remain.png" title="Pending Build">{% else %}{% ifequal latest_build.result "FAILED" %}<img src="/assets/images/exclamation.png" title="Build Failure">{% else %} {% ifequal latest_build.result "COMPLETED" %} <img src="/assets/images/10.png" title="Build Successful"> {% else %} <img src="/assets/images/51.png" title="Not yet built">{% endifequal %}{% endifequal %}{% endif %}
             </td>
             <td>
-                <a href="{% url offspring.web.queuemanager.views.project_details project.name %}">{{ project.title }}</a>
+                <a href="{% url 'offspring.web.queuemanager.views.project_details' project.name %}">{{ project.title }}</a>
             </td>
             <td>
                 {{project.get_status_display|default_if_none:"Unknown"}}
@@ -51,7 +51,7 @@
                 {{ project.arch }}
             </td>
             <td>
-                {% if latest_build %} <a href="{% url offspring.web.queuemanager.views.build_details project.name latest_build.name %}" title="View build details">{{ latest_build.name }}</a>{% endif %}
+                {% if latest_build %} <a href="{% url 'offspring.web.queuemanager.views.build_details' project.name latest_build.name %}" title="View build details">{{ latest_build.name }}</a>{% endif %}
             </td>
             <td>
                 {% ifequal latest_build.result "FAILED" %} <font color="red"> {% endifequal %} {{ latest_build.result }}

=== modified file 'lib/offspring/web/templates/queuemanager/sidebars/build_farm.html'
--- lib/offspring/web/templates/queuemanager/sidebars/build_farm.html	2012-02-16 06:31:01 +0000
+++ lib/offspring/web/templates/queuemanager/sidebars/build_farm.html	2014-01-10 10:20:42 +0000
@@ -5,10 +5,10 @@
 {% if lexbuilders %}
     {% for builder in lexbuilders %}
     <li class="{{ builder.status }}">
-        <a href="{% url builder_details builder %}" title="View builder details">{{ builder }}</a>: 
+        <a href="{% url 'builder_details' builder %}" title="View builder details">{{ builder }}</a>: 
         {% ifequal builder.current_state "BUILDING" %}
         <p>
-            <a title="View project details" href="{% url offspring.web.queuemanager.views.project_details builder.current_build_projectname %}">
+            <a title="View project details" href="{% url 'offspring.web.queuemanager.views.project_details' builder.current_build_projectname %}">
             {{builder.current_build_projectname}}
             </a>
             <a title="View build log in new window" target="_blank" href="{{ builder.current_build_projectname|link_results:builder.current_build_buildname }}/build-log.txt">

=== modified file 'lib/offspring/web/templates/queuemanager/sidebars/failed_builds.html'
--- lib/offspring/web/templates/queuemanager/sidebars/failed_builds.html	2010-11-29 08:27:24 +0000
+++ lib/offspring/web/templates/queuemanager/sidebars/failed_builds.html	2014-01-10 10:20:42 +0000
@@ -4,7 +4,7 @@
 {% if recent_failures %}
 <ul class="builds_failed">
     {% for buildresult in recent_failures %}
-        <li title="Build Failure"><a title="View project details" href="{% url offspring.web.queuemanager.views.project_details buildresult.project.name %}">{{ buildresult.project.name }}</a> <a title="View build log in new window" target="_blank" href="{{ buildresult.project.name|link_results:buildresult.name }}/build-log.txt">{{buildresult.name}}</a></li>
+        <li title="Build Failure"><a title="View project details" href="{% url 'offspring.web.queuemanager.views.project_details' buildresult.project.name %}">{{ buildresult.project.name }}</a> <a title="View build log in new window" target="_blank" href="{{ buildresult.project.name|link_results:buildresult.name }}/build-log.txt">{{buildresult.name}}</a></li>
     {% endfor %}
 {% else %}
 <ul>

=== modified file 'lib/offspring/web/templates/queuemanager/sidebars/queued_builds.html'
--- lib/offspring/web/templates/queuemanager/sidebars/queued_builds.html	2012-02-16 06:31:01 +0000
+++ lib/offspring/web/templates/queuemanager/sidebars/queued_builds.html	2014-01-10 10:20:42 +0000
@@ -2,7 +2,7 @@
 {% if pending_builds %}
 <ul class="builds_pending">
     {% for build_request in pending_builds %}
-        <li title="Build Pending"> <a href="{% url offspring.web.queuemanager.views.project_details build_request.project.name %}" title="{{ build_request }}{% if user.is_staff %} Score: {{ build_request.score }} {% endif %}">{{ build_request.project }}</a></li>
+        <li title="Build Pending"> <a href="{% url 'offspring.web.queuemanager.views.project_details' build_request.project.name %}" title="{{ build_request }}{% if user.is_staff %} Score: {{ build_request.score }} {% endif %}">{{ build_request.project }}</a></li>
     {% endfor %}
 {% else %}
 <ul>

=== modified file 'lib/offspring/web/urls.py'
--- lib/offspring/web/urls.py	2013-10-10 15:23:03 +0000
+++ lib/offspring/web/urls.py	2014-01-10 10:20:42 +0000
@@ -1,17 +1,12 @@
 # Copyright 2010-2013 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
-
 import os
 
 from django.conf import settings
 from django.conf.urls.defaults import (
-    handler404,
-    handler500,
-    include,
-    patterns,
-    url
-)
+    handler404, handler500, include, patterns, url)
 from django.contrib import admin
+from django.contrib.auth.decorators import login_required, permission_required
 
 from djcelery.models import TaskState, WorkerState
 from piston.resource import Resource
@@ -28,21 +23,24 @@
 )
 from offspring.web.queuemanager.models import Lexbuilder
 from offspring.web.queuemanager.views import (
-    project_create,
-    project_edit,
+    ProjectCreateView,
+    ProjectEditView,
+    BuilderListView,
+    BuilderDetailView,
     secure_object_list,
     secure_object_detail
 )
 
+
 admin.autodiscover()
 
 # TaskState and WorkerState models will not get created or updated if we're
 # using a database as the broker for celery. This is confusing if you're
 # unaware of this current limitation so lets not show them in the admin
 # interface in this scenario.
-if settings.BROKER_TRANSPORT == 'djkombu.transport.DatabaseTransport':
-    admin.site.unregister(TaskState)
-    admin.site.unregister(WorkerState)
+# if settings.BROKER_TRANSPORT == 'djkombu.transport.DatabaseTransport':
+#    admin.site.unregister(TaskState)
+#    admin.site.unregister(WorkerState)
 
 milestone_handler = Resource(LaunchpadProjectMilestoneHandler)
 buildrequest_handler = Resource(BuildRequestHandler)
@@ -57,20 +55,10 @@
     (r'^admin/', include(admin.site.urls)),
     (r'^openid/', include('django_openid_auth.urls')),
     (r'^logout/', 'django.contrib.auth.views.logout'),
-    (r'^builders/$', secure_object_list, {
-        'queryset' : Lexbuilder.objects.filter(is_retired=False).order_by(
-            "-is_active", "-machine_type", "-created_at"),
-        'template_name' : 'queuemanager/builders.html',
-        'template_object_name' : 'builder',
-        'extra_context' : { 'pillar' : 'builders', },
-    }, 'builders_list'),
-    (r'^builders/(?P<slug>[^/]+)/$', secure_object_detail, {
-        'queryset' : Lexbuilder.objects.filter(is_retired=False),
-        'slug_field' : 'name',
-        'template_name' : 'queuemanager/builder_details.html',
-        'template_object_name' : 'builder',
-        'extra_context' : { 'pillar' : 'builders', },
-    }, 'builder_details'),
+
+    url(r'^builders/$', login_required(BuilderListView.as_view()), name='builders_list'),
+    url(r'^builders/(?P<slug>[^/]+)/$', login_required(BuilderDetailView.as_view()), name='builder_details'),
+
     (r'^builders/\+api/(?P<builderName>[^/]+)/builds/$', buildresult_handler),
     (r'^builds/\+api/$', buildresult_handler),
     (r'^builds/\+api/(?P<projectName>[^/]+)/$', buildresult_handler),
@@ -84,8 +72,10 @@
     (r'^launchpad_project/\+add/$', 'offspring.web.queuemanager.views.launchpad_project_create'),
     (r'^project_group/\+add/$', 'offspring.web.queuemanager.views.projectgroup_create'),
     (r'^project-groups/(?P<projectGroupName>[^/]+)/$', 'offspring.web.queuemanager.views.projectgroup_details'),
-    url(r'^projects/\+add/$', project_create, name="project_create"),
-    url(r'^projects/(?P<projectName>[^/]+)/\+edit$', project_edit, name="project_edit"),
+
+    url(r'^projects/\+add/$', permission_required('queuemanager.add_project')(ProjectCreateView.as_view()), name="project_create"),
+
+    url(r'^projects/(?P<projectName>[^/]+)/\+edit$', permission_required('queuemanager.change_project')(ProjectEditView.as_view()), name='project_edit'),
     (r'^projects/(?P<projectName>[^/]+)/sources\.list$', 'offspring.web.queuemanager.views.project_development_sourcesList'),
     (r'^projects/(?P<projectName>[^/]+)/\+api/subscription/$', projectNotificationSubscription_handler),
     (r'^projects/(?P<projectName>[^/]+)/\+api/releases/$', release_handler),

=== modified file 'requirements/requirements.master.txt'
--- requirements/requirements.master.txt	2013-10-03 14:06:15 +0000
+++ requirements/requirements.master.txt	2014-01-10 10:20:42 +0000
@@ -1,4 +1,4 @@
-django==1.4.8
+django==1.5.5
 storm==0.20
 launchpadlib==1.6.4
 oauth==1.0.1

=== modified file 'requirements/requirements.web.txt'
--- requirements/requirements.web.txt	2013-10-03 14:06:15 +0000
+++ requirements/requirements.web.txt	2014-01-10 10:20:42 +0000
@@ -1,8 +1,8 @@
-django==1.4.8
+django==1.5.5
 storm==0.20
 django-group-access>=1.1.3
 django-openid-auth==0.3
-django-piston==0.2.2lexbuild1
+django-piston==0.2.2lexbuild2
 launchpadlib==1.6.4
 oauth==1.0.1
 python-openid>=2.2.4