Merge branch 'dev-v2.6' into 2.6

CHANGELOG.rst

@@ -7,6 +7,23 @@
 Changelog
 ---------
 
+v.2.6.8 2019-07-03
+==================
+
+General notes:
+ * Note: This version does not requires a requirements upgrade on source installations
+ * Note: This version does not requires a database upgrade
+ * Note: This version does not require a Solr schema upgrade
+
+Fixes:
+
+ * Fix broken div nesting in the `user/read_base.html` (`#4672 <https://github.com/ckan/ckan/issues/4672>`_)
+ * Strip local path when uploading file in IE (`#4608 <https://github.com/ckan/ckan/issues/4608>`_)
+ * Increase size of h1 headings to 1.8em (`#4665 <https://github.com/ckan/ckan/issues/4665>`_)
+ * Fix `ValueError` in `url_validator` (`#4629 <https://github.com/ckan/ckan/issues/4629>`_)
+ * More robust auth functions for `resource_view_show` (`#4827 <https://github.com/ckan/ckan/issues/4827>`_)
+ * Allow to customize the DataProxy URL (`#4874 <https://github.com/ckan/ckan/issues/4874>`_)
+ * Allow custom CKAN callback URL for the DataPusher (`#4878 <https://github.com/ckan/ckan/issues/4878>`_)
 
 v2.6.7 2018-12-12
 =================

ckan/__init__.py

@@ -1,6 +1,6 @@
 # encoding: utf-8
 
-__version__ = '2.6.7'
+__version__ = '2.6.8'
 
 __description__ = 'CKAN Software'
 __long_description__ = \

ckan/logic/auth/get.py

@@ -152,7 +152,15 @@ def resource_show(context, data_dict):
 
 
 def resource_view_show(context, data_dict):
-    return authz.is_authorized('resource_show', context, data_dict)
+
+    model = context['model']
+
+    resource_view = model.ResourceView.get(data_dict['id'])
+    if not resource_view:
+        raise logic.NotFound(_('Resource view not found, cannot check auth.'))
+    resource = model.Resource.get(resource_view.resource_id)
+
+    return authz.is_authorized('resource_show', context, {'id': resource.id})
 
 
 def resource_view_list(context, data_dict):

ckan/logic/validators.py

@@ -681,18 +681,19 @@ def url_validator(key, data, errors, context):
     import urlparse
     import string
 
-    model = context['model']
-    session = context['session']
-
     url = data.get(key, None)
     if not url:
         return
 
-    pieces = urlparse.urlparse(url)
-    if all([pieces.scheme, pieces.netloc]) and \
-       set(pieces.netloc) <= set(string.letters + string.digits + '-.') and \
-       pieces.scheme in ['http', 'https']:
-       return
+    try:
+        pieces = urlparse.urlparse(url)
+        if all([pieces.scheme, pieces.netloc]) and \
+           set(pieces.netloc) <= set(string.letters + string.digits + '-.') and \
+           pieces.scheme in ['http', 'https']:
+           return
+    except ValueError:
+        # url is invalid
+        pass
 
     errors[key].append(_('Please provide a valid URL'))
 

ckan/public/base/css/fuchsia.css

@@ -9226,7 +9226,7 @@ iframe {
   border: none;
 }
 .embedded-content h1 {
-  font-size: 1.4em;
+  font-size: 1.8em;
 }
 .embedded-content h2 {
   font-size: 1.4em;

ckan/public/base/css/green.css

@@ -9226,7 +9226,7 @@ iframe {
   border: none;
 }
 .embedded-content h1 {
-  font-size: 1.4em;
+  font-size: 1.8em;
 }
 .embedded-content h2 {
   font-size: 1.4em;

ckan/public/base/css/main.css

@@ -9226,7 +9226,7 @@ iframe {
   border: none;
 }
 .embedded-content h1 {
-  font-size: 1.4em;
+  font-size: 1.8em;
 }
 .embedded-content h2 {
   font-size: 1.4em;

ckan/public/base/css/maroon.css

@@ -9226,7 +9226,7 @@ iframe {
   border: none;
 }
 .embedded-content h1 {
-  font-size: 1.4em;
+  font-size: 1.8em;
 }
 .embedded-content h2 {
   font-size: 1.4em;

ckan/public/base/css/red.css

@@ -9226,7 +9226,7 @@ iframe {
   border: none;
 }
 .embedded-content h1 {
-  font-size: 1.4em;
+  font-size: 1.8em;
 }
 .embedded-content h2 {
   font-size: 1.4em;

ckan/public/base/i18n/am.js

@@ -0,0 +1,218 @@
+{
+  "": {
+    "domain": "ckan", 
+    "lang": "am", 
+    "plural-forms": "nplurals=2; plural=(n > 1);"
+  }, 
+  "%(color)s shirt": [
+    "%(color)s shirts", 
+    "%(color)s ሸሚዝ", 
+    "%(color)s ሸሚዞች"
+  ], 
+  "%(num)d item": [
+    "%(num)d items", 
+    "%(num)d እቃ", 
+    "%(num)d እቃዎች"
+  ], 
+  "%(num)d missing translation": [
+    "%(num)d missing translations", 
+    "%(num)d ትርጉም የሌለው", 
+    "%(num)d ትርጉም የሌላቸው"
+  ], 
+  "Add Filter": [
+    null, 
+    "ማጣሪያ ጨምር"
+  ], 
+  "An Error Occurred": [
+    null, 
+    "ስህተት ተፈጥሯል"
+  ], 
+  "Are you sure you want to perform this action?": [
+    null, 
+    " ይህንን እርምጃ ማከናወን መፈለግዎን እርግጠኛ ነዎት?"
+  ], 
+  "Cancel": [
+    null, 
+    "ሰርዝ"
+  ], 
+  "Confirm": [
+    null, 
+    "አረጋግጥ"
+  ], 
+  "Could not load view": [
+    null, 
+    "እይታን መጫን አልቻለም"
+  ], 
+  "DataProxy returned an error": [
+    null, 
+    "የመረጃ ተኪው(DataProxy) ስህተት መልሷል"
+  ], 
+  "DataStore returned an error": [
+    null, 
+    "የመረጃ ማከማቻው(DataStore) ስህተት መልሷል"
+  ], 
+  "Edit": [
+    null, 
+    "አድስ"
+  ], 
+  "Failed to load data API information": [
+    null, 
+    "የኤፒአይ መረጃ መጫን አልተሳካም"
+  ], 
+  "File": [
+    null, 
+    "ፋይል"
+  ], 
+  "Filters": [
+    null, 
+    "ማጣሪያዎች"
+  ], 
+  "Follow": [
+    null, 
+    "ተከተል"
+  ], 
+  "Graph": [
+    null, 
+    "ግራፍ"
+  ], 
+  "Grid": [
+    null, 
+    "ፍርግርግ"
+  ], 
+  "Hide": [
+    null, 
+    "ደብቅ"
+  ], 
+  "Image": [
+    null, 
+    "ምስል"
+  ], 
+  "Input is too short, must be at least one character": [
+    "Input is too short, must be at least %(num)d characters", 
+    "ግብዓቱ በጣም አጭር ነው ፤ ቢያንስ አንድ ቁምፊ(ትዕምርት) መሆን አለበት", 
+    "ግብዓቱ በጣም አጭር ነው ፤ ቢያንስ %(num)d ቁምፊዎች(ትዕምርቶች) መሆን አለበት"
+  ], 
+  "Link": [
+    null, 
+    "አገናኝ(ሊንክ)"
+  ], 
+  "Link to a URL on the internet (you can also link to an API)": [
+    null, 
+    "በኢንተርኔት ላይ ወደ ዩአርኤል አገናኝ (ወደ ኤ.ፒ.አይ መገናኘት ይችላሉ)"
+  ], 
+  "Loading...": [
+    null, 
+    "በመጫን ላይ"
+  ], 
+  "Map": [
+    null, 
+    "ካርታ"
+  ], 
+  "No matches found": [
+    null, 
+    "ምንም ተዛማጆች አልተገኙም"
+  ], 
+  "Please Confirm Action": [
+    null, 
+    "እባክዎን እርምጃውን(ድርጊቱን) ያረጋግጡ"
+  ], 
+  "Remove": [
+    null, 
+    "አስወግድ"
+  ], 
+  "Resource uploaded": [
+    null, 
+    "የመረጃ ምንጩ ተቀምⶆል"
+  ], 
+  "Save order": [
+    null, 
+    "ቅደም-ተከተሉን አስቀምጥ"
+  ], 
+  "Saving...": [
+    null, 
+    "እያስቀመጠ..."
+  ], 
+  "Select a field": [
+    null, 
+    "መስክ ምረጥ"
+  ], 
+  "Show more": [
+    null, 
+    "ተጨማሪ አሳይ"
+  ], 
+  "Start typing…": [
+    null, 
+    "መተየብ(መጻፍ) ይጀምሩ..."
+  ], 
+  "There are unsaved modifications to this form": [
+    null, 
+    "በዚህ ቅጽ ላይ ያልተቀመጡ(ያልተያዙ) ለውጦች አሉ"
+  ], 
+  "There is no API data to load for this resource": [
+    null, 
+    "ለዚህ የመረጃ-ምንጭ ምንም የሚጫን የኤፒአይ መረጃ የለም"
+  ], 
+  "URL": [
+    null, 
+    "ዩአርኤል"
+  ], 
+  "Unable to authenticate upload": [
+    null, 
+    "ማስቀመጡን ማረጋገጥ አልተቻለም"
+  ], 
+  "Unable to get data for uploaded file": [
+    null, 
+    "ለተቀመጠው ፋይል መረጃ ለማግኘት አልተቻለም"
+  ], 
+  "Unable to upload file": [
+    null, 
+    "ፋይል ማስቀመጥ አልተቻለም"
+  ], 
+  "Unfollow": [
+    null, 
+    "አትከተል"
+  ], 
+  "Upload": [
+    null, 
+    "አስቀምጥ"
+  ], 
+  "Upload a file": [
+    null, 
+    "ፋይል አስቀምጥ"
+  ], 
+  "Upload a file on your computer": [
+    null, 
+    "በኮምፒዩተርዎ ውስጥ ያለ ፋይል ያስቀምጡ"
+  ], 
+  "You are uploading a file. Are you sure you want to navigate away and stop this upload?": [
+    null, 
+    "ፋይል እያስቀመጡ ነው ፤ ወደ ሌላ ቦታ መሄድ ማስቆም እንደሚፈልጉ እርግጠኛ ነዎት?"
+  ], 
+  "bar": [
+    "bars", 
+    "ባር", 
+    "ባሮች"
+  ], 
+  "error loading view": [
+    null, 
+    "እይታን በመጫን ላይ የተፈጠረ ስህተት"
+  ], 
+  "foo": [
+    null, 
+    "ፎ.."
+  ], 
+  "hello %(name)s!": [
+    null, 
+    "ሰላም %(name)s!"
+  ], 
+  "no %(attr)s translation": [
+    "no %(attr)s translations", 
+    "ምንም %(attr)s ትርጉም የለም", 
+    "ምንም %(attr)s ትርጉሞች የሉም"
+  ], 
+  "no translation": [
+    "no translations", 
+    "ምንም ትርጉም የለም", 
+    "ምንም ትርጉሞች የሉም"
+  ]
+}

ckan/public/base/i18n/ar.js

@@ -2,7 +2,7 @@
   "": {
     "domain": "ckan",
     "lang": "ar",
-    "plural-forms": "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5"
+    "plural-forms": "nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;"
   },
   "Cancel": [
     null,

ckan/public/base/i18n/bg.js

@@ -2,7 +2,7 @@
   "": {
     "domain": "ckan",
     "lang": "bg",
-    "plural-forms": "nplurals=2; plural=(n != 1)"
+    "plural-forms": "nplurals=2; plural=(n != 1);"
   },
   "An Error Occurred": [
     null,

ckan/public/base/i18n/ca.js

@@ -2,7 +2,7 @@
   "": {
     "domain": "ckan",
     "lang": "ca",
-    "plural-forms": "nplurals=2; plural=(n != 1)"
+    "plural-forms": "nplurals=2; plural=(n != 1);"
   },
   "An Error Occurred": [
     null,