From patchwork Sun Jan 10 23:07:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Finucane X-Patchwork-Id: 565550 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [103.22.144.68]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 72DC01402BC for ; Mon, 11 Jan 2016 10:12:54 +1100 (AEDT) Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 555861A1947 for ; Mon, 11 Jan 2016 10:12:54 +1100 (AEDT) X-Original-To: patchwork@lists.ozlabs.org Delivered-To: patchwork@lists.ozlabs.org Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by lists.ozlabs.org (Postfix) with ESMTP id EDC5C1A17EB for ; Mon, 11 Jan 2016 10:10:40 +1100 (AEDT) Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by orsmga103.jf.intel.com with ESMTP; 10 Jan 2016 15:10:40 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.20,550,1444719600"; d="scan'208";a="27003351" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga004.fm.intel.com with ESMTP; 10 Jan 2016 15:10:38 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id u0ANAbD5022404; Sun, 10 Jan 2016 23:10:37 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id u0ANAbbX015995; Sun, 10 Jan 2016 23:10:37 GMT Received: (from sfinucan@localhost) by sivswdev01.ir.intel.com with id u0ANAbRP015991; Sun, 10 Jan 2016 23:10:37 GMT From: Stephen Finucane To: patchwork@lists.ozlabs.org Subject: [PATCH 05/10] urls: Add url names Date: Sun, 10 Jan 2016 23:07:54 +0000 Message-Id: <1452467279-14952-6-git-send-email-stephen.finucane@intel.com> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1452467279-14952-1-git-send-email-stephen.finucane@intel.com> References: <1452467279-14952-1-git-send-email-stephen.finucane@intel.com> X-BeenThere: patchwork@lists.ozlabs.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: Patchwork development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: patchwork-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Patchwork" Reverse by name is an alternative to reverse by Python path. The names must be added as a prerequisite for removing reverse by Python path, per Django documentation. https://docs.djangoproject.com/en/1.9/ref/urlresolvers/#django.core.urlresolvers.reverse Signed-off-by: Stephen Finucane --- patchwork/urls.py | 81 ++++++++++++++++++++++++++++++++++--------------------- 1 file changed, 50 insertions(+), 31 deletions(-) diff --git a/patchwork/urls.py b/patchwork/urls.py index 5be286a..57b1a10 100644 --- a/patchwork/urls.py +++ b/patchwork/urls.py @@ -29,24 +29,35 @@ urlpatterns = patterns( '', url(r'^admin/', include(admin.site.urls)), - (r'^$', 'patchwork.views.project.list'), - (r'^project/(?P[^/]+)/list/$', 'patchwork.views.patch.list'), - (r'^project/(?P[^/]+)/$', 'patchwork.views.project.project'), + url(r'^$', 'patchwork.views.project.list', name='project-list'), + url(r'^project/(?P[^/]+)/list/$', 'patchwork.views.patch.list', + name='patch-list'), + url(r'^project/(?P[^/]+)/$', 'patchwork.views.project.project', + name='project-detail'), # patch views - (r'^patch/(?P\d+)/$', 'patchwork.views.patch.patch'), - (r'^patch/(?P\d+)/raw/$', 'patchwork.views.patch.content'), - (r'^patch/(?P\d+)/mbox/$', 'patchwork.views.patch.mbox'), + url(r'^patch/(?P\d+)/$', 'patchwork.views.patch.patch', + name='patch-detail'), + url(r'^patch/(?P\d+)/raw/$', 'patchwork.views.patch.content', + name='patch-raw'), + url(r'^patch/(?P\d+)/mbox/$', 'patchwork.views.patch.mbox', + name='patch-mbox'), # logged-in user stuff - (r'^user/$', 'patchwork.views.user.profile'), - (r'^user/todo/$', 'patchwork.views.user.todo_lists'), - (r'^user/todo/(?P[^/]+)/$', 'patchwork.views.user.todo_list'), + url(r'^user/$', 'patchwork.views.user.profile', name='user-profile'), + url(r'^user/todo/$', 'patchwork.views.user.todo_lists', + name='user-todos'), + url(r'^user/todo/(?P[^/]+)/$', + 'patchwork.views.user.todo_list', + name='user-todo'), - (r'^user/bundles/$', 'patchwork.views.bundle.bundles'), + url(r'^user/bundles/$', 'patchwork.views.bundle.bundles', + name='bundle-list'), - (r'^user/link/$', 'patchwork.views.user.link'), - (r'^user/unlink/(?P[^/]+)/$', 'patchwork.views.user.unlink'), + url(r'^user/link/$', 'patchwork.views.user.link', + name='user-link'), + url(r'^user/unlink/(?P[^/]+)/$', 'patchwork.views.user.unlink', + name='user-unlink'), # password change url(r'^user/password-change/$', auth_views.password_change, @@ -74,43 +85,51 @@ urlpatterns = patterns( name='auth_logout'), # registration - (r'^register/', 'patchwork.views.user.register'), + url(r'^register/', 'patchwork.views.user.register', name='user-register'), # public view for bundles - (r'^bundle/(?P[^/]*)/(?P[^/]*)/$', - 'patchwork.views.bundle.bundle'), - (r'^bundle/(?P[^/]*)/(?P[^/]*)/mbox/$', - 'patchwork.views.bundle.mbox'), + url(r'^bundle/(?P[^/]*)/(?P[^/]*)/$', + 'patchwork.views.bundle.bundle', + name='bundle-detail'), + url(r'^bundle/(?P[^/]*)/(?P[^/]*)/mbox/$', + 'patchwork.views.bundle.mbox', + name='bundle-mbox'), - (r'^confirm/(?P[0-9a-f]+)/$', 'patchwork.views.confirm'), + url(r'^confirm/(?P[0-9a-f]+)/$', 'patchwork.views.confirm', + name='confirm'), # submitter autocomplete - (r'^submitter/$', 'patchwork.views.api.submitters'), + url(r'^submitter/$', 'patchwork.views.api.submitters', + name='api-submitters'), # email setup - (r'^mail/$', 'patchwork.views.mail.settings'), - (r'^mail/optout/$', 'patchwork.views.mail.optout'), - (r'^mail/optin/$', 'patchwork.views.mail.optin'), + url(r'^mail/$', 'patchwork.views.mail.settings', name='mail-settings'), + url(r'^mail/optout/$', 'patchwork.views.mail.optout', name='mail-optout'), + url(r'^mail/optin/$', 'patchwork.views.mail.optin', name='mail-optin'), # help! - (r'^help/(?P.*)$', 'patchwork.views.help.help'), + url(r'^help/(?P.*)$', 'patchwork.views.help.help', name='help'), ) if settings.ENABLE_XMLRPC: urlpatterns += patterns( '', - (r'xmlrpc/$', 'patchwork.views.xmlrpc.xmlrpc'), - (r'^pwclient/$', 'patchwork.views.pwclient.pwclient'), - (r'^project/(?P[^/]+)/pwclientrc/$', - 'patchwork.views.pwclient.pwclientrc'), + url(r'xmlrpc/$', 'patchwork.views.xmlrpc.xmlrpc', name='xmlrpc'), + url(r'^pwclient/$', 'patchwork.views.pwclient.pwclient', + name='pwclient'), + url(r'^project/(?P[^/]+)/pwclientrc/$', + 'patchwork.views.pwclient.pwclientrc', + name='pwclientrc'), ) # redirect from old urls if settings.COMPAT_REDIR: urlpatterns += patterns( '', - (r'^user/bundle/(?P[^/]+)/$', - 'patchwork.views.bundle.bundle_redir'), - (r'^user/bundle/(?P[^/]+)/mbox/$', - 'patchwork.views.bundle.mbox_redir'), + url(r'^user/bundle/(?P[^/]+)/$', + 'patchwork.views.bundle.bundle_redir', + name='bundle-redir'), + url(r'^user/bundle/(?P[^/]+)/mbox/$', + 'patchwork.views.bundle.mbox_redir', + name='bundle-mbox-redir'), )