merge upstream/master

.gitignore

@@ -25,6 +25,7 @@ fl_notes.txt
 *.ini
 .noseids
 *~
+.idea
 
 # custom style
 ckan/public/base/less/custom.less

ckan/config/environment.py

@@ -69,9 +69,21 @@ def find_controller(self, controller):
 
     # Pylons paths
     root = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
+
+    valid_base_public_folder_names = ['public', 'public-bs2']
+    static_files = app_conf.get('ckan.base_public_folder', 'public')
+    app_conf['ckan.base_public_folder'] = static_files
+
+    if static_files not in valid_base_public_folder_names:
+        raise CkanConfigurationException(
+            'You provided an invalid value for ckan.base_public_folder. '
+            'Possible values are: "public" and "public-bs2".'
+        )
+
+    log.info('Loading static files from %s' % static_files)
     paths = dict(root=root,
                  controllers=os.path.join(root, 'controllers'),
-                 static_files=os.path.join(root, 'public'),
+                 static_files=os.path.join(root, static_files),
                  templates=[])
 
     # Initialize main CKAN config object
@@ -220,7 +232,19 @@ def update_config():
     helpers.load_plugin_helpers()
     config['pylons.h'] = helpers.helper_functions
 
-    jinja2_templates_path = os.path.join(root, 'templates')
+    # Templates and CSS loading from configuration
+    valid_base_templates_folder_names = ['templates', 'templates-bs2']
+    templates = config.get('ckan.base_templates_folder', 'templates')
+    config['ckan.base_templates_folder'] = templates
+
+    if templates not in valid_base_templates_folder_names:
+        raise CkanConfigurationException(
+            'You provided an invalid value for ckan.base_templates_folder. '
+            'Possible values are: "templates" and "templates-bs2".'
+        )
+
+    jinja2_templates_path = os.path.join(root, templates)
+    log.info('Loading templates from %s' % jinja2_templates_path)
     template_paths = [jinja2_templates_path]
 
     extra_template_paths = config.get('extra_template_paths', '')

ckan/config/middleware/flask_app.py

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 import os
+import re
 import inspect
 import itertools
 import pkgutil
@@ -174,6 +175,10 @@ def hello_world_post():
             'bottom': True,
             'bundle': True,
         }
+    root_path = config.get('ckan.root_path', None)
+    if root_path:
+        root_path = re.sub('/{{LANG}}', '', root_path)
+        fanstatic_config['base_url'] = root_path
     app = Fanstatic(app, **fanstatic_config)
 
     for plugin in PluginImplementations(IMiddleware):

ckan/config/middleware/pylons_app.py

@@ -1,6 +1,7 @@
 # encoding: utf-8
 
 import os
+import re
 
 from pylons.wsgiapp import PylonsApp
 
@@ -89,6 +90,10 @@ def make_pylons_stack(conf, full_stack=True, static_files=True,
             'bottom': True,
             'bundle': True,
         }
+    root_path = config.get('ckan.root_path', None)
+    if root_path:
+        root_path = re.sub('/{{LANG}}', '', root_path)
+        fanstatic_config['base_url'] = root_path
     app = Fanstatic(app, **fanstatic_config)
 
     for plugin in PluginImplementations(IMiddleware):

ckan/controllers/feed.py

@@ -411,11 +411,12 @@ def output_feed(self, results, feed_title, feed_description,
                 author_email=pkg.get('author_email', ''),
                 categories=[t['name'] for t in pkg.get('tags', [])],
                 enclosure=webhelpers.feedgenerator.Enclosure(
-                    self.base_url + h.url_for(controller='api',
-                                              register='package',
-                                              action='show',
-                                              id=pkg['name'],
-                                              ver='2'),
+                    h.url_for(controller='api',
+                              register='package',
+                              action='show',
+                              id=pkg['name'],
+                              ver='3',
+                              qualified=True),
                     unicode(len(json.dumps(pkg))),   # TODO fix this
                     u'application/json'),
                 **additional_fields

ckan/controllers/group.py

@@ -670,8 +670,11 @@ def member_new(self, id):
 
         context = {'model': model, 'session': model.Session,
                    'user': c.user}
+        try:
+            self._check_access('group_member_create', context, {'id': id})
+        except NotAuthorized:
+            abort(403, _('Unauthorized to create group %s members') % '')
 
-        # self._check_access('group_delete', context, {'id': id})
         try:
             data_dict = {'id': id}
             data_dict['include_datasets'] = False

ckan/controllers/package.py

@@ -546,17 +546,23 @@ def new(self, data=None, errors=None, error_summary=None):
     def resource_edit(self, id, resource_id, data=None, errors=None,
                       error_summary=None):
 
+        context = {'model': model, 'session': model.Session,
+                   'api_version': 3, 'for_edit': True,
+                   'user': c.user, 'auth_user_obj': c.userobj}
+        data_dict = {'id': id}
+
+        try:
+            check_access('package_update', context, data_dict)
+        except NotAuthorized:
+            abort(403, _('User %r not authorized to edit %s') % (c.user, id))
+
         if request.method == 'POST' and not data:
             data = data or \
                 clean_dict(dict_fns.unflatten(tuplize_dict(parse_params(
                                                            request.POST))))
             # we don't want to include save as it is part of the form
             del data['save']
 
-            context = {'model': model, 'session': model.Session,
-                       'api_version': 3, 'for_edit': True,
-                       'user': c.user, 'auth_user_obj': c.userobj}
-
             data['package_id'] = id
             try:
                 if resource_id:
@@ -574,9 +580,6 @@ def resource_edit(self, id, resource_id, data=None, errors=None,
             h.redirect_to(controller='package', action='resource_read', id=id,
                           resource_id=resource_id)
 
-        context = {'model': model, 'session': model.Session,
-                   'api_version': 3, 'for_edit': True,
-                   'user': c.user, 'auth_user_obj': c.userobj}
         pkg_dict = get_action('package_show')(context, {'id': id})
         if pkg_dict['state'].startswith('draft'):
             # dataset has not yet been fully created

ckan/lib/cli.py

@@ -26,7 +26,6 @@
 import ckan.model as model
 import ckan.include.rjsmin as rjsmin
 import ckan.include.rcssmin as rcssmin
-import ckan.lib.fanstatic_resources as fanstatic_resources
 import ckan.plugins as p
 from ckan.common import config
 
@@ -230,6 +229,7 @@ def load_config(config, load_site_user=True):
     import pylons
     registry.register(pylons.translator, MockTranslator())
 
+    site_user = None
     if model.user_table.exists() and load_site_user:
         # If the DB has already been initialized, create and register
         # a pylons context object, and add the site user to it, so the
@@ -249,6 +249,8 @@ def load_config(config, load_site_user=True):
     request_config.host = parsed.netloc + parsed.path
     request_config.protocol = parsed.scheme
 
+    return site_user
+
 
 def paster_click_group(summary):
     '''Return a paster command click.Group for paster subcommands
@@ -305,11 +307,7 @@ class CkanCommand(paste.script.command.Command):
     group_name = 'ckan'
 
     def _load_config(self, load_site_user=True):
-        load_config(self.options.config, load_site_user)
-
-    def _setup_app(self):
-        cmd = paste.script.appinstall.SetupCommand('setup-app')
-        cmd.run([self.filename])
+        self.site_user = load_config(self.options.config, load_site_user)
 
 
 class ManageDb(CkanCommand):
@@ -1478,7 +1476,6 @@ class CreateTestDataCommand(CkanCommand):
 
     def command(self):
         self._load_config()
-        self._setup_app()
         from ckan import plugins
         from create_test_data import CreateTestData
 
@@ -1795,8 +1792,9 @@ def command(self):
         saturation = None
         lightness = None
 
+        public = config.get(u'ckan.base_public_folder')
         path = os.path.dirname(__file__)
-        path = os.path.join(path, '..', 'public', 'base', 'less', 'custom.less')
+        path = os.path.join(path, '..', public, 'base', 'less', 'custom.less')
 
         if self.args:
             arg = self.args[0]
@@ -1987,6 +1985,8 @@ def minify_file(self, path):
         :param path: The path to the .js or .css file to minify
 
         '''
+        import ckan.lib.fanstatic_resources as fanstatic_resources
+
         path_only, extension = os.path.splitext(path)
 
         if path_only.endswith('.min'):
@@ -2022,6 +2022,7 @@ class LessCommand(CkanCommand):
     min_args = 0
 
     def command(self):
+        self._load_config()
         self.less()
 
     custom_css = {
@@ -2071,7 +2072,9 @@ def less(self):
         directory = output[0].strip()
         less_bin = os.path.join(directory, 'lessc')
 
-        root = os.path.join(os.path.dirname(__file__), '..', 'public', 'base')
+        public = config.get(u'ckan.base_public_folder')
+
+        root = os.path.join(os.path.dirname(__file__), '..', public, 'base')
         root = os.path.abspath(root)
         custom_less = os.path.join(root, 'less', 'custom.less')
         for color in self.custom_css:
@@ -2094,6 +2097,7 @@ def compile_less(self, root, less_bin, color):
 
         process = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE, universal_newlines=True)
         output = process.communicate()
+        print output
 
 
 class FrontEndBuildCommand(CkanCommand):
@@ -2124,7 +2128,8 @@ def command(self):
         # minification
         cmd = MinifyCommand('minify')
         cmd.options = self.options
-        root = os.path.join(os.path.dirname(__file__), '..', 'public', 'base')
+        public = config.get(u'ckan.base_public_folder')
+        root = os.path.join(os.path.dirname(__file__), '..', public, 'base')
         root = os.path.abspath(root)
         ckanext = os.path.join(os.path.dirname(__file__), '..', '..', 'ckanext')
         ckanext = os.path.abspath(ckanext)

ckan/lib/fanstatic_resources.py

@@ -4,6 +4,7 @@
 import sys
 import logging
 import ConfigParser
+from ckan.common import config
 
 from fanstatic import Library, Resource, Group, get_library_registry
 import fanstatic.core as core
@@ -78,10 +79,10 @@ def create_resource(path, lib_name, count, inline=False):
             condition = IE_conditionals[path][0]
         if inline or condition:
             kw['renderer'] = fanstatic_extensions.CkanCustomRenderer(
-                                        condition=condition,
-                                        script=inline,
-                                        renderer=renderer,
-                                        other_browsers=other_browsers)
+                condition=condition,
+                script=inline,
+                renderer=renderer,
+                other_browsers=other_browsers)
         resource = Resource(library, path, **kw)
 
         # Add our customised ordering
@@ -161,7 +162,8 @@ def create_resource(path, lib_name, count, inline=False):
                         dep_resources = [dep]
                     else:
                         dep_resources = groups[dep]
-                    diff = [res for res in dep_resources if res not in depends[resource]]
+                    diff = [
+                        res for res in dep_resources if res not in depends[resource]]
                     depends[resource].extend(diff)
 
     # process each .js/.css file found
@@ -174,8 +176,8 @@ def create_resource(path, lib_name, count, inline=False):
             filepath = os.path.join(rel_path, f)
             filename_only, extension = os.path.splitext(f)
             if extension in ('.css', '.js') and (
-                not filename_only.endswith('.min')):
-              resource_list.append(filepath)
+                    not filename_only.endswith('.min')):
+                resource_list.append(filepath)
 
     # if groups are defined make sure the order supplied there is honored
     for group in groups:
@@ -227,9 +229,13 @@ def create_resource(path, lib_name, count, inline=False):
     registry = get_library_registry()
     registry.add(library)
 
-base_path = os.path.abspath(os.path.join(os.path.dirname(__file__),
-                                         '..', 'public', 'base'))
 
+public = config.get('ckan.base_public_folder')
+
+base_path = os.path.abspath(os.path.join(
+    os.path.dirname(__file__), '..', public, 'base'))
+
+log.info('Base path {0}'.format(base_path))
 create_library('vendor', os.path.join(base_path, 'vendor'), depend_base=False)
 
 create_library('base', os.path.join(base_path, 'javascript'),

ckan/lib/helpers.py

@@ -33,7 +33,6 @@
 import i18n
 
 import ckan.exceptions
-import ckan.lib.fanstatic_resources as fanstatic_resources
 import ckan.model as model
 import ckan.lib.formatters as formatters
 import ckan.lib.maintain as maintain
@@ -1088,7 +1087,7 @@ class Page(paginate.Page):
 
     def pager(self, *args, **kwargs):
         kwargs.update(
-            format=u"<div class='pagination pagination-centered'><ul>"
+            format=u"<div class='pagination-wrapper'><ul class='pagination'>"
             "$link_previous ~2~ $link_next</ul></div>",
             symbol_previous=u'«', symbol_next=u'»',
             curpage_attr={'class': 'active'}, link_attr={}
@@ -1621,6 +1620,7 @@ def remove_url_param(key, value=None, replace=None, controller=None,
 
 @core_helper
 def include_resource(resource):
+    import ckan.lib.fanstatic_resources as fanstatic_resources
     r = getattr(fanstatic_resources, resource)
     r.need()
 
@@ -1632,6 +1632,8 @@ def urls_for_resource(resource):
 
     NOTE: This is for special situations only and is not the way to generally
     include resources.  It is advised not to use this function.'''
+    import ckan.lib.fanstatic_resources as fanstatic_resources
+
     r = getattr(fanstatic_resources, resource)
     resources = list(r.resources)
     core = fanstatic_resources.fanstatic_extensions.core
@@ -2325,7 +2327,8 @@ def get_translated(data_dict, field):
     try:
         return data_dict[field + u'_translated'][language]
     except KeyError:
-        return data_dict.get(field, '')
+        val = data_dict.get(field, '')
+        return _(val) if val and isinstance(val, basestring) else val
 
 
 @core_helper