From 051e97c6b2c110714616f6ac8c632d1c80f7ed42 Mon Sep 17 00:00:00 2001
From: Michael Polidori <contact@michaelpolidori.com>
Date: Fri, 11 Feb 2022 11:35:49 -0500
Subject: [PATCH] Fix apostrophe in values breaking validation (#520)

---
 .../javascript/dist/modules/viz-preview.js    | 20 +++++++++++++++----
 ckanext/querytool/helpers.py                  |  4 ++--
 .../templates/ajax_snippets/chart_item.html   |  3 ++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js b/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js
index 94d5a88d..eab81c20 100644
--- a/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js
+++ b/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js
@@ -2456,10 +2456,16 @@
                                 html += '<option value="solid">Solid</option>';
                             }
 
+                            if (html_line_type == 'dash') {
+                                html += '<option value="dash" selected>Dashed</option>';
+                            } else {
+                                html += '<option value="dash">Dashed</option>';
+                            }
+
                             if (html_line_type == 'dashdot') {
-                                html += '<option value="dashdot" selected>Dashed</option>';
+                                html += '<option value="dashdot" selected>Dash Dot</option>';
                             } else {
-                                html += '<option value="dashdot">Dashed</option>';
+                                html += '<option value="dashdot">Dash Dot</option>';
                             }
 
                             if (html_line_type == 'dot') {
@@ -2492,10 +2498,16 @@
                                 html += '<option value="solid">Solid</option>';
                             }
 
+                            if (html_line_type == 'dash') {
+                                html += '<option value="dash" selected>Dashed</option>';
+                            } else {
+                                html += '<option value="dash">Dashed</option>';
+                            }
+
                             if (html_line_type == 'dashdot') {
-                                html += '<option value="dashdot" selected>Dashed</option>';
+                                html += '<option value="dashdot" selected>Dash Dot</option>';
                             } else {
-                                html += '<option value="dashdot">Dashed</option>';
+                                html += '<option value="dashdot">Dash Dot</option>';
                             }
 
                             if (html_line_type == 'dot') {
diff --git a/ckanext/querytool/helpers.py b/ckanext/querytool/helpers.py
index 2876f896..8ddc2e94 100644
--- 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
index e701cf57..28956b66 100644
--- 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>