diff options
| author | Dan McGee <dan@archlinux.org> | 2010-02-12 05:15:13 +0100 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2010-02-27 20:36:58 +0100 |
| commit | a0cd93c1d528fbb1c5919fed0a52b09bbe84933d (patch) | |
| tree | 8b66c6a510a2a38db5f86e333fbd761db624f931 | |
| parent | a70a3a04c70f27d2dd95b74c13264909d15a0e2e (diff) | |
| download | archweb-a0cd93c1d528fbb1c5919fed0a52b09bbe84933d.tar.gz archweb-a0cd93c1d528fbb1c5919fed0a52b09bbe84933d.tar.xz | |
Bring package files view up to speed
Move it away from the numeric pkgid-based view of old to the new pretty URL
format. This does nothing to actually make the view show files (or even
provide a link to it), but that will come in future commits.
Signed-off-by: Dan McGee <dan@archlinux.org>
| -rw-r--r-- | packages/views.py | 9 | ||||
| -rw-r--r-- | urls.py | 3 |
2 files changed, 7 insertions, 5 deletions
diff --git a/packages/views.py b/packages/views.py index 97929ed..acd71b2 100644 --- a/packages/views.py +++ b/packages/views.py @@ -60,7 +60,7 @@ def update(request): def details(request, name='', repo='', arch=''): if all([name, repo, arch]): - pkg= get_object_or_404(Package, + pkg = get_object_or_404(Package, pkgname=name, repo__name__iexact=repo, arch__name=arch) return render_to_response('packages/details.html', RequestContext( request, {'pkg': pkg, })) @@ -178,9 +178,10 @@ def search(request, page=None): template_object_name="package", extra_context=page_dict) -def files(request, pkgid): - pkg = get_object_or_404(Package, id=pkgid) - files = PackageFile.objects.filter(pkg=pkgid) +def files(request, name='', repo='', arch=''): + pkg = get_object_or_404(Package, + pkgname=name, repo__name__iexact=repo, arch__name=arch) + files = PackageFile.objects.filter(pkg=pkg) return render_to_response('packages/files.html', RequestContext(request, {'pkg':pkg,'files':files})) @permission_required('main.change_package') @@ -27,7 +27,6 @@ urlpatterns = patterns('', (r'^packages/flag/(\d+)/$', 'packages.views.flag'), (r'^packages/flaghelp/$', 'packages.views.flaghelp'), (r'^packages/unflag/(\d+)/$', 'packages.views.unflag'), - (r'^packages/files/(\d+)/$', 'packages.views.files'), (r'^packages/signoffs/$', 'packages.views.signoffs'), (r'^packages/signoff_package/(?P<arch>[A-z0-9]+)/(?P<pkgname>[A-z0-9\-+.]+)/$', 'packages.views.signoff_package'), @@ -46,6 +45,8 @@ urlpatterns = patterns('', 'packages.views.details'), (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/$', 'packages.views.details'), + (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/files/$', + 'packages.views.files'), (r'^packages/(?P<repo>[A-z0-9\-]+)/(?P<arch>[A-z0-9]+)/(?P<name>[A-z0-9\-+.]+)/maintainer/$', 'packages.views.getmaintainer'), |