Author: jacob
Date: 2008-10-03 11:19:39 -0500 (Fri, 03 Oct 2008)
New Revision: 9111
Modified:
djangoproject.com/djangodocs/urls.py
djangoproject.com/djangodocs/views.py
Log:
[djangoproject.com] Fixed #9246 - fixed some URLs.
Modified: djangoproject.com/djangodocs/urls.py
===================================================================
--- djangoproject.com/djangodocs/urls.py 2008-10-02 12:57:13 UTC (rev
9110)
+++ djangoproject.com/djangodocs/urls.py 2008-10-03 16:19:39 UTC (rev
9111)
@@ -11,8 +11,15 @@
djangodocs.views.language,
),
url(
+ r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/$',
+ djangodocs.views.document,
+ {'url': ''},
+ name = 'document-index',
+ ),
+ url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/search/$',
djangodocs.views.search,
+ name = 'document-search',
),
url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/_images/(?P<path>.*)$',
@@ -25,5 +32,6 @@
url(
r'^(?P<lang>[a-z-]+)/(?P<version>[\w.-]+)/(?P<url>[\w./-]*)/$',
djangodocs.views.document,
+ name = 'document-detail',
),
)
Modified: djangoproject.com/djangodocs/views.py
===================================================================
--- djangoproject.com/djangodocs/views.py 2008-10-02 12:57:13 UTC (rev
9110)
+++ djangoproject.com/djangodocs/views.py 2008-10-03 16:19:39 UTC (rev
9111)
@@ -10,19 +10,17 @@
def index(request):
return HttpResponseRedirect(
- urlresolvers.reverse(document, kwargs={
+ urlresolvers.reverse('document-index', kwargs={
'lang': 'en',
'version': 'dev',
- 'url': '',
})
)
def language(request, lang):
return HttpResponseRedirect(
- urlresolvers.reverse(document, kwargs={
+ urlresolvers.reverse('document-index', kwargs={
'lang': lang,
'version': 'dev',
- 'url': '',
})
)
@@ -49,8 +47,8 @@
'doc': pickle.load(open(doc, 'rb')),
'env': pickle.load(open(docroot.child('globalcontext.pickle'), 'rb')),
'update_date':
datetime.datetime.fromtimestamp(docroot.child('last_build').mtime()),
- 'home': urlresolvers.reverse(document, kwargs={'lang':lang,
'version':version, 'url':''}),
- 'search': urlresolvers.reverse(search, kwargs={'lang':lang,
'version':version}),
+ 'home': urlresolvers.reverse('document-index', kwargs={'lang':lang,
'version':version}),
+ 'search': urlresolvers.reverse('document-search', kwargs={'lang':lang,
'version':version}),
}))
def images(request, lang, version, path):
@@ -84,6 +82,6 @@
'query': request.GET.get('q'),
'query_string': mutable_get.urlencode(),
'env': pickle.load(open(docroot.child('globalcontext.pickle'), 'rb')),
- 'home': urlresolvers.reverse(document, kwargs={'lang':lang,
'version':version, 'url':''}),
- 'search': urlresolvers.reverse(search, kwargs={'lang':lang,
'version':version}),
+ 'home': urlresolvers.reverse('document-index', kwargs={'lang':lang,
'version':version}),
+ 'search': urlresolvers.reverse('document-search', kwargs={'lang':lang,
'version':version}),
}))
\ No newline at end of file
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---
