Merge branch 'develop' for release 1.1.0

conwetlab · Sep 24, 2018 · 71540ea · 71540ea
2 parents a6dfe99 + 9abe5ff
commit 71540ea
Show file tree

Hide file tree

Showing 16 changed files with 587 additions and 54 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,11 +1,13 @@
 sudo: required
 language: python
+group: deprecated-2017Q4
 python:
     - "2.7"
 env:
     - CKANVERSION=2.5.6 POSTGISVERSION=2
     - CKANVERSION=2.6.3 POSTGISVERSION=2
     - CKANVERSION=2.7.0 POSTGISVERSION=2
+    - CKANVERSION=2.8.1 POSTGISVERSION=2
 services:
     - redis-server
     - postgresql

diff --git a/README.md b/README.md
@@ -248,6 +248,11 @@ python setup.py nosetests
 
 ## Changelog
 
+### v1.1.0
+
+* New: Compatibility with CKAN 2.8.0
+* New: Somali translation (thanks to @SimuliChina)
+
 ### v1.0.0
 
 * New: Option to follow data requests.
@@ -270,7 +275,7 @@ python setup.py nosetests
 
 ### v0.4.1
 
-* New: Brazilian Portuguese (thanks to @allysonbarros)
+* New: Brazilian Portuguese translation (thanks to @allysonbarros)
 
 ### v0.4.0
 

diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
@@ -149,7 +149,7 @@ def pager_url(state=None, sort=None, q=None, page=None):
             if include_organization_facet is True:
                 c.facet_titles['organization'] = tk._('Organizations')
 
-            return tk.render(file_to_render)
+            return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
         except ValueError as e:
             # This exception should only occur if the page value is not valid
             log.warn(e)

diff --git a/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo