Fix apostrophe in values breaking validation (#520)

datopian · Feb 11, 2022 · 051e97c · 051e97c
1 parent 0b3eb46
commit 051e97c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js b/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js
diff --git a/ckanext/querytool/helpers.py b/ckanext/querytool/helpers.py
@@ -295,7 +295,7 @@ def _create_where_clause(filters):
                 op = u'='
                 name = _['name']
 
-                if isinstance(_['value'], str):
+                if isinstance(_['value'], basestring):
                     value = _['value'].replace('\'', '\'\'')
                 else:
                     value = _['value']
@@ -312,7 +312,7 @@ def _create_where_clause(filters):
             op = u'='
             name = _['name']
 
-            if isinstance(_['value'], str):
+            if isinstance(_['value'], basestring):
                 value = _['value'].replace('\'', '\'\'')
             else:
                 value = _['value']

diff --git a/ckanext/querytool/templates/ajax_snippets/chart_item.html b/ckanext/querytool/templates/ajax_snippets/chart_item.html
@@ -206,7 +206,8 @@
                 <label class="control-label" for="chart_field_line_type_{{ n }}_{{ line_count }}">{{ line_type_title }}</label>
                 <select id='chart_field_line_type_{{ n }}_{{ line_count }}' name='chart_field_line_type_{{ n }}_{{ line_count }}'>
                   <option value="solid" {% if line_types %}{{ 'selected' if plotly|length >= line_count and line_types_selection[line_count - 1] == 'solid' }}{{ else }}{{ 'selected' }}{% endif %}>Solid</option>
-                  <option value="dashdot" {% if line_types %}{{ 'selected' if plotly|length >= line_count and line_types_selection[line_count - 1] == 'dashdot' }}{% endif %}>Dashed</option>
+                  <option value="dash" {% if line_types %}{{ 'selected' if plotly|length >= line_count and line_types_selection[line_count - 1] == 'dash' }}{% endif %}>Dashed</option>
+                  <option value="dashdot" {% if line_types %}{{ 'selected' if plotly|length >= line_count and line_types_selection[line_count - 1] == 'dashdot' }}{% endif %}>Dash Dot</option>
                   <option value="dot" {% if line_types %}{{ 'selected' if plotly|length >= line_count and line_types_selection[line_count - 1] == 'dot' }}{% endif %}>Dotted</option>
                 </select>
               </div>