summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--apps/patchwork/urls.py2
-rw-r--r--apps/patchwork/views/base.py14
-rw-r--r--apps/patchwork/views/project.py39
-rw-r--r--templates/base.html2
4 files changed, 41 insertions, 16 deletions
diff --git a/apps/patchwork/urls.py b/apps/patchwork/urls.py
index 4352db0..b49b4e1 100644
--- a/apps/patchwork/urls.py
+++ b/apps/patchwork/urls.py
@@ -24,7 +24,7 @@ urlpatterns = patterns('',
# Example:
(r'^$', 'patchwork.views.projects'),
(r'^project/(?P<project_id>[^/]+)/list/$', 'patchwork.views.patch.list'),
- (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project'),
+ (r'^project/(?P<project_id>[^/]+)/$', 'patchwork.views.project.project'),
# patch views
(r'^patch/(?P<patch_id>\d+)/$', 'patchwork.views.patch.patch'),
diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index e30fc6e..338c673 100644
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -43,20 +43,6 @@ def projects(request):
context['projects'] = projects
return render_to_response('patchwork/projects.html', context)
-def project(request, project_id):
- context = PatchworkRequestContext(request)
- project = get_object_or_404(Project, linkname = project_id)
- context.project = project
-
- context['maintainers'] = User.objects.filter( \
- userprofile__maintainer_projects = project)
- context['n_patches'] = Patch.objects.filter(project = project,
- archived = False).count()
- context['n_archived_patches'] = Patch.objects.filter(project = project,
- archived = True).count()
-
- return render_to_response('patchwork/project.html', context)
-
def pwclientrc(request, project_id):
project = get_object_or_404(Project, linkname = project_id)
context = PatchworkRequestContext(request)
diff --git a/apps/patchwork/views/project.py b/apps/patchwork/views/project.py
new file mode 100644
index 0000000..798e8a7
--- /dev/null
+++ b/apps/patchwork/views/project.py
@@ -0,0 +1,39 @@
+# Patchwork - automated patch tracking system
+# Copyright (C) 2009 Jeremy Kerr <jk@ozlabs.org>
+#
+# This file is part of the Patchwork package.
+#
+# Patchwork is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# Patchwork is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Patchwork; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+from patchwork.models import Patch, Project, Person
+from django.shortcuts import render_to_response, get_object_or_404
+from django.contrib.auth.models import User
+from django.contrib.auth.decorators import login_required
+from patchwork.requestcontext import PatchworkRequestContext
+
+def project(request, project_id):
+ context = PatchworkRequestContext(request)
+ project = get_object_or_404(Project, linkname = project_id)
+ context.project = project
+
+ context['maintainers'] = User.objects.filter( \
+ userprofile__maintainer_projects = project)
+ context['n_patches'] = Patch.objects.filter(project = project,
+ archived = False).count()
+ context['n_archived_patches'] = Patch.objects.filter(project = project,
+ archived = True).count()
+
+ return render_to_response('patchwork/project.html', context)
diff --git a/templates/base.html b/templates/base.html
index c6a5b03..216797f 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -46,7 +46,7 @@
<a href="{% url patchwork.views.patch.list project_id=project.linkname %}"
>patches</a>
:
- <a href="{% url patchwork.views.project project_id=project.linkname %}"
+ <a href="{% url patchwork.views.project.project project_id=project.linkname %}"
>project info</a>
{% if other_projects %}
: