Updated recline view; Fixed a javascript error; Added code to support…

… map configuration for both recline_view and recline_map_view
ckan · Aug 12, 2016 · 0666e94 · miguelbgouveia · Sep 6, 2016 · 0666e94
1 parent ce4c989
commit 0666e94
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/ckanext/reclineview/plugin.py b/ckanext/reclineview/plugin.py
@@ -85,6 +85,8 @@ class ReclineView(ReclineViewBase):
     This extension views resources using a Recline MultiView.
     '''
 
+    p.implements(p.ITemplateHelpers, inherit=True)
+
     def info(self):
         return {'name': 'recline_view',
                 'title': 'Data Explorer',
@@ -106,6 +108,11 @@ def can_view(self, data_dict):
         else:
             return False
 
+    def get_helpers(self):
+        return {
+            'get_map_config': get_mapview_config
+        }
+
 
 class ReclineGridView(ReclineViewBase):
     '''

diff --git a/ckanext/reclineview/theme/public/recline_view.js b/ckanext/reclineview/theme/public/recline_view.js
@@ -121,7 +121,7 @@ this.ckan.module('recline_view', function (jQuery, _) {
           state.lonField = reclineView.longitude_field;
         }
 
-        view = new ckan.MapView({model: dataset, state: state, mapConfig: map_config});
+        view = new ckan.MapView({model: dataset, state: state, mapConfig: this.options.map_config});
       } else if(reclineView.view_type === "recline_view") {
         view = this._newDataExplorer(dataset, this.options.map_config);
       } else {

diff --git a/ckanext/reclineview/theme/templates/recline_view.html b/ckanext/reclineview/theme/templates/recline_view.html
@@ -2,7 +2,7 @@
 
 {% block page %}
 
-  {% set map_config = h.get_mapview_config() %}
+  {% set map_config = h.get_map_config() or h.get_mapview_config() %}
   <div data-module="recline_view"
        data-module-site_url="{{ h.dump_json(h.url('/', locale='default', qualified=true)) }}"
        data-module-resource = "{{ h.dump_json(resource_json) }}";