Merge pull request #20 from OpenDevelopmentMekong/master

merging to prod for releasing v2.2.4
OpenDevelopmentMekong · Oct 20, 2017 · d16bae6 · d16bae6
2 parents 500729b + d727bcb
commit d16bae6
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/_ci/deploy.sh b/_ci/deploy.sh
@@ -16,7 +16,7 @@ if [ $TRAVIS_TAG ]; then
     echo "$(tput sgr0)" # reset
 
     export ANSIBLE_HOST_KEY_CHECKING=False
-    time ./deploy.sh ckan prod
+    time ./deploy.sh ckan prod ckanext-odm_agreement
 
 else
 
@@ -26,7 +26,7 @@ else
     echo "$(tput sgr0)" # reset
 
     export ANSIBLE_HOST_KEY_CHECKING=False
-    time ./deploy.sh ckan dev
+    time ./deploy.sh ckan dev ckanext-odm_agreement
 
 fi
 

diff --git a/ckanext/odm_agreement/templates/package/read_base.html b/ckanext/odm_agreement/templates/package/read_base.html
@@ -25,7 +25,7 @@
 	{% if dataset_type == 'agreement' and c.userobj %}
 		{% set missing_agreement = h.odm_agreement_validate_fields(pkg) %}
 		{% if missing_agreement["package"] or missing_agreement["resources"] %}
-			{% block inconsistency_disclaimer_dataset %}
+			{% block inconsistency_disclaimer_agreement %}
 				<h2 class="module-heading"><i class="icon-alert"></i> {{ _("Record metadata not complete!!") }}</h2>
 				<div class="disclaimer">
 					<p>{{ _('This agreement is missing some mandatory fields, please complete:') }}</p>

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '2.2.3'
+version = '2.2.4'
 
 setup(
     name='ckanext-odm_agreement',