Ticket #12699: stableversion.diff

djangodocs/views.py

@@ -12 +12 @@
     return HttpResponseRedirect(
         urlresolvers.reverse('document-index', kwargs={
             'lang': 'en',
-            'version': '1.1',
+            'version': settings.STABLE_VERSION,
         })
     )
     
@@ -20 +20 @@
     return HttpResponseRedirect(
         urlresolvers.reverse('document-index', kwargs={
             'lang': lang,
-            'version': '1.1',
+            'version': settings.STABLE_VERSION,
         })
     )
 
+def check_version(version):
+    return version == 'stable' and settings.STABLE_VERSION or version
+
 def get_docroot(lang, version):
-    docroot = Path(settings.DOCS_PICKLE_ROOT).child(lang, version, "_build", "json")
+    docroot = Path(settings.DOCS_PICKLE_ROOT).child(lang, check_version(version), "_build", "json")
     if not docroot.exists():
         raise Http404()
     return docroot
 
 def document(request, lang, version, url):
+    version = check_version(version)
     docroot = get_docroot(lang, version)
     
     # First look for <bits>/index.fpickle, then for <bits>.fpickle
@@ -86 +90 @@
     return response
 
 def search(request, lang, version):
+    version = check_version(version)
     docroot = get_docroot(lang, version)
     
     # Remove the 'cof' GET variable from the query string so that the page
@@ -102 +107 @@
         'env': simplejson.load(open(docroot.child('globalcontext.json'), 'rb')),
         '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
+    }))

djangodocs/settings.py

@@ -8 +8 @@
 ROOT_URLCONF = 'djangodocs.urls'
 CACHE_MIDDLEWARE_KEY_PREFIX = 'djangodocs'
 
-DOCS_PICKLE_ROOT = "/home/djangodocs/"
- No newline at end of file
+STABLE_VERSION = "1.1"
+DOCS_PICKLE_ROOT = "/home/djangodocs/"