Merge pull request #337 from keitaroinc/viz-info-rsq

Fixed problem while showing more info for the visualization on the re…
keitaroinc · Mar 6, 2020 · 42b49ab · 42b49ab
2 parents 44c1070 + eac2da9
commit 42b49ab
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/ckanext/knowledgehub/fanstatic/javascript/visualization_info.js b/ckanext/knowledgehub/fanstatic/javascript/visualization_info.js
@@ -56,10 +56,14 @@ ckan.module('visualization_info', function ($) {
       if (description != "") {
         content += '<p>' + '<b>Description: </b>' + description + '</p>';
       }
-      if (rsq != "") {
-        rsq = rsq.replace(/u'/g, "")
-        rsq = rsq.replace(/'/g, "").replace("[", "").replace("]", "");
-        content += '<p>' + '<b>Research questions: </b>' + rsq + '</p>';
+      if (typeof rsq === "string") {
+        if (rsq != "") {
+          rsq = rsq.replace(/u'/g, "")
+          rsq = rsq.replace(/'/g, "").replace("[", "").replace("]", "");
+          content += '<p>' + '<b>Research questions: </b>' + rsq + '</p>';
+        }
+      } else {
+        content += '<p>' + '<b>Research questions: </b>' + "None" + '</p>';
       }
       // if (rq_ids == 0)
       //   rqs = "This dataset contains no research <br/ > questions.";

diff --git a/ckanext/knowledgehub/templates/ajax_snippets/visual_info_module.html b/ckanext/knowledgehub/templates/ajax_snippets/visual_info_module.html
@@ -1,6 +1,7 @@
 {% resource 'knowledgehub/javascript/visualization_info.js' %}
 
-<button data-module="visualization_info" data-module-title="{{ title }}" data-module-subtitle="{{ subtitle }}"
-  data-module-description="{{description}}" data-module-resq="{{resq}}" data-module-resource_id="{{ resource_id }}">
+<button type="button" data-module="visualization_info" data-module-title="{{ title }}"
+  data-module-subtitle="{{ subtitle }}" data-module-description="{{description}}" data-module-resq="{{resq}}"
+  data-module-resource_id="{{ resource_id }}">
   <i class="fa fa-info-circle"></i>
 </button>