[ckan-changes] commit/ckan: dread: [config][xs]: Unused guide option removed.

Fri Oct 28 12:02:13 UTC 2011

1 new commit in ckan:


https://bitbucket.org/okfn/ckan/changeset/9b4d1ca44118/
changeset:   9b4d1ca44118
user:        dread
date:        2011-10-28 14:00:29
summary:     [config][xs]: Unused guide option removed.
affected #:  3 files

diff -r e25d1d7573a3414ea57d201f0b6fb57fd5894b22 -r 9b4d1ca4411830df6effbe0f01988b7decaa94be ckan/config/deployment.ini_tmpl

--- a/ckan/config/deployment.ini_tmpl
+++ b/ckan/config/deployment.ini_tmpl
@@ -75,9 +75,6 @@
 #changeset.auto_commit = true
 #changeset.sources = http://www.ckan.net/,
 
-# Guide location
-#guide_url = http://wiki.okfn.org/ckan/doc/
-
 ## extra places to look for templates and public files (comma separated lists)
 ## any templates/files found will override correspondingly named ones in
 ## ckan/templates/ and ckan/public


diff -r e25d1d7573a3414ea57d201f0b6fb57fd5894b22 -r 9b4d1ca4411830df6effbe0f01988b7decaa94be ckan/config/routing.py
--- a/ckan/config/routing.py
+++ b/ckan/config/routing.py
@@ -29,7 +29,6 @@
     map.connect('*url', controller='home', action='cors_options',
         conditions=dict(method=['OPTIONS']))
     map.connect('home', '/', controller='home', action='index')
-    map.connect('guide', config.get('guide_url', 'http://wiki.okfn.org/ckan/doc/'), _static=True)
     map.connect('/locale', controller='home', action='locale')
     map.connect('about', '/about', controller='home', action='about')
 


diff -r e25d1d7573a3414ea57d201f0b6fb57fd5894b22 -r 9b4d1ca4411830df6effbe0f01988b7decaa94be ckan/tests/functional/test_home.py
--- a/ckan/tests/functional/test_home.py
+++ b/ckan/tests/functional/test_home.py
@@ -47,10 +47,6 @@
         offset = '/some_nonexistent_url'
         res = self.app.get(offset, status=404)
 
-    def test_guide(self):
-        url = url_for('guide')
-        assert url == 'http://wiki.okfn.org/ckan/doc/'
-
     def test_template_head_end(self):
         offset = url_for('home')
         res = self.app.get(offset)

Repository URL: https://bitbucket.org/okfn/ckan/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.


