merge upstream/master

CHANGELOG.rst

@@ -23,6 +23,7 @@ Major:
  * Datastore dump more formats: CSV, TSV, XML, JSON; BOM option (`#3390 <https://github.com/ckan/ckan/pull/3390>`_)
  * Common requests code for Flask and Pylons (`#3212 <https://github.com/ckan/ckan/pull/3212>`_)
  * Generate complete datastore dump files (`#3344 <https://github.com/ckan/ckan/pull/3344>`_)
+ * A new system for asynchronous background jobs (`#3165 <https://github.com/ckan/ckan/pull/3165>`_). The old Celery-based system is still available but deprecated. Please refer to the `documentation <http://docs.ckan.org/en/ckan-2.7.0/maintaining/background-tasks.html>`_ for details.
 
 Minor:
  * Renamed example theme plugin (`#3576 <https://github.com/ckan/ckan/pull/3576>`_)

ckan/lib/cli.py

@@ -2117,6 +2117,7 @@ def command(self):
 
         # Less css
         cmd = LessCommand('less')
+        cmd.options = self.options
         cmd.command()
 
         # js translation strings

ckan/lib/fanstatic_resources.py

@@ -235,7 +235,7 @@ def create_resource(path, lib_name, count, inline=False):
 base_path = os.path.abspath(os.path.join(
     os.path.dirname(__file__), '..', public, 'base'))
 
-log.info('Base path {0}'.format(base_path))
+log.debug('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/logic/action/update.py

@@ -7,6 +7,7 @@
 import time
 import json
 import mimetypes
+import os
 
 from ckan.common import config
 import paste.deploy.converters as converters
@@ -1273,8 +1274,11 @@ def config_option_update(context, data_dict):
     for key, value in data.iteritems():
 
         # Set full Logo url
-        if key =='ckan.site_logo' and value and not value.startswith('http'):
-            value = h.url_for_static('uploads/admin/{0}'.format(value))
+        if key == 'ckan.site_logo' and value and not value.startswith('http')\
+                and not value.startswith('/'):
+            image_path = 'uploads/admin/'
+
+            value = h.url_for_static('{0}{1}'.format(image_path, value))
 
         # Save value in database
         model.set_system_info(key, value)

ckan/logic/auth/create.py

@@ -104,7 +104,7 @@ def package_relationship_create(context, data_dict):
     authorized2 = authz.is_authorized_boolean(
         'package_update', context, {'id': id2})
 
-    if not authorized1 and authorized2:
+    if not (authorized1 and authorized2):
         return {'success': False, 'msg': _('User %s not authorized to edit these packages') % user}
     else:
         return {'success': True}

ckan/public-bs2/base/css/fuchsia.css

@@ -7951,6 +7951,11 @@ h4 small {
   width: 14px;
   margin-top: 1px;
 }
+.nav-tabs .fa:last-child,
+.module-heading .fa:last-child,
+.btn .fa:last-child {
+  margin-right: 3px;
+}
 .wrapper {
   *zoom: 1;
   background-color: #FFF;

ckan/public-bs2/base/css/green.css

@@ -7951,6 +7951,11 @@ h4 small {
   width: 14px;
   margin-top: 1px;
 }
+.nav-tabs .fa:last-child,
+.module-heading .fa:last-child,
+.btn .fa:last-child {
+  margin-right: 3px;
+}
 .wrapper {
   *zoom: 1;
   background-color: #FFF;

ckan/public-bs2/base/css/main.css

@@ -7951,6 +7951,11 @@ h4 small {
   width: 14px;
   margin-top: 1px;
 }
+.nav-tabs .fa:last-child,
+.module-heading .fa:last-child,
+.btn .fa:last-child {
+  margin-right: 3px;
+}
 .wrapper {
   *zoom: 1;
   background-color: #FFF;

ckan/public-bs2/base/css/maroon.css

@@ -7951,6 +7951,11 @@ h4 small {
   width: 14px;
   margin-top: 1px;
 }
+.nav-tabs .fa:last-child,
+.module-heading .fa:last-child,
+.btn .fa:last-child {
+  margin-right: 3px;
+}
 .wrapper {
   *zoom: 1;
   background-color: #FFF;

ckan/public-bs2/base/css/red.css

@@ -7951,6 +7951,11 @@ h4 small {
   width: 14px;
   margin-top: 1px;
 }
+.nav-tabs .fa:last-child,
+.module-heading .fa:last-child,
+.btn .fa:last-child {
+  margin-right: 3px;
+}
 .wrapper {
   *zoom: 1;
   background-color: #FFF;

ckan/public-bs2/base/less/icons.less

@@ -194,3 +194,13 @@
     margin-top: 1px;
   }
 }
+
+.nav-tabs,
+.module-heading,
+.btn {
+  .fa {
+    &:last-child {
+      margin-right: 3px;
+    }
+  }
+}