Merge branch 'poc-flask-views.common-url_for-take-2' into poc-flask-v…

…iews.common-url_for-take-2-tests

ckan/common.py

@@ -44,6 +44,16 @@ class Request(object):
     Wraps the request object, returning attributes from either the Flask or
     Pylons request object, depending of whether flask.request is available.
     '''
+
+    @property
+    def params(self):
+        ''' Special case as request.params is used all over the place.
+        '''
+        if is_flask():
+            return flask.request.args
+        else:
+            return pylons.request.params
+
     def __getattr__(self, name):
         if is_flask():
             return getattr(flask.request, name, None)

ckan/config/middleware/flask_app.py

@@ -86,7 +86,7 @@ def save_session(self, app, session, response):
             data_dir=cache_dir),
         'session.key': app_conf.get('beaker.session.key'),
         'session.cookie_expires':
-            app_conf.get('beaker.session.cookie_expires'),
+        app_conf.get('beaker.session.cookie_expires'),
         'session.secret': app_conf.get('beaker.session.secret')
     }
     app.wsgi_app = SessionMiddleware(app.wsgi_app, session_opts)

ckan/lib/helpers.py

@@ -207,13 +207,12 @@ def url_for(*args, **kw):
         if not ver:
             raise Exception('api calls must specify the version! e.g. ver=3')
 
+    if kw.get('qualified', False) or kw.get('_external', False):
+        kw['protocol'], kw['host'] = get_site_protocol_and_host()
+
     original_args = tuple(args)
     original_kw = kw.copy()
 
-    if kw.get('qualified', False) or kw.get('_external', False):
-        original_kw['protocol'], original_kw['host'] = get_site_protocol_and_host()
-
-    # TODO: this probably does not cover all cases
     if (len(args) and '_' in args[0]
             and '.' not in args[0]
             and not args[0].startswith('/')):