Merge pull request #3477 from OCHA-DAP/hotfix-roea

#3420 - EA Page changes
OCHA-DAP · Sep 2, 2015 · 30a9d9f · 30a9d9f
2 parents 1c29f6b + c88926a
commit 30a9d9f
Show file tree

Hide file tree

Showing 9 changed files with 8,691 additions and 21 deletions.
diff --git a/ckanext-hdx_org_group/ckanext/hdx_org_group/controllers/custom_org_controller.py b/ckanext-hdx_org_group/ckanext/hdx_org_group/controllers/custom_org_controller.py
@@ -87,7 +87,8 @@ def assemble_viz_config(self, vis_json_config):
         if visualization.get('visualization-select', '') == 'ROEA':
             config.update({
                 'data': "/api/action/datastore_search?resource_id=" + visualization.get('viz-resource-id', '') + "&limit=10000000",
-                'geo': h.url_for('perma_storage_file', id=visualization.get('viz-geo-dataset-id', ''), resource_id=visualization.get('viz-geo-resource-id', ''))
+                'geo': h.url_for('perma_storage_file', id=visualization.get('viz-geo-dataset-id', ''), resource_id=visualization.get('viz-geo-resource-id', '')),
+                'source': visualization.get('viz-data-source', '')
             })
 
         if visualization.get('visualization-select', '') == 'WFP':

diff --git a/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/resource.config b/ckanext-hdx_theme/ckanext/hdx_theme/fanstatic/resource.config
@@ -180,8 +180,8 @@ custom-vis-3w =
 custom-vis-roea =
 	vendor/d3/d3.js
 	vendor/dc/dc.css
-	vendor/dc/dc.js
-	vendor/dc/dc.leaflet.js
+	widget/ROEA/dc.js
+	widget/ROEA/dc.leaflet.js
 	vendor/crossfilter/crossfilter.js
 	widget/ROEA/site.css
 	widget/ROEA/site.js