Merge pull request #123 from ViderumGlobal/related-fixes

Fix various bugs, separate main from related queries

Author: ZoranPandovski

ckanext/querytool/controllers/querytool.py

@@ -436,7 +436,6 @@ def querytool_public_read(self, name):
             )
             related_querytool['public_filters'] = related_new_filters
             related_querytool['public_filters'].sort(key=itemgetter('order'))
-
             related_querytool['sql_string'] = related_sql_string
 
         return render('querytool/public/read.html',

ckanext/querytool/helpers.py

@@ -339,15 +339,25 @@ def get_resource_columns(res_id):
     return fields
 
 
-def get_available_related_querytools():
+def get_available_related_querytools(name=None):
 
     session = m.Session
 
-    query = session.query(CkanextQueryTool, CkanextQueryToolVisualizations) \
-        .join((CkanextQueryToolVisualizations, CkanextQueryTool.id ==
-               CkanextQueryToolVisualizations.ckanext_querytool_id)) \
-        .filter(CkanextQueryTool.type == 'related').\
-        filter(CkanextQueryToolVisualizations.charts != '')
+    if name:
+        query = session.query(CkanextQueryTool,
+                              CkanextQueryToolVisualizations) \
+            .join((CkanextQueryToolVisualizations, CkanextQueryTool.id ==
+                   CkanextQueryToolVisualizations.ckanext_querytool_id)) \
+            .filter(CkanextQueryTool.type == 'related').\
+            filter(CkanextQueryTool.name != name).\
+            filter(CkanextQueryToolVisualizations.charts != '')
+    else:
+        query = session.query(CkanextQueryTool,
+                              CkanextQueryToolVisualizations) \
+            .join((CkanextQueryToolVisualizations, CkanextQueryTool.id ==
+                   CkanextQueryToolVisualizations.ckanext_querytool_id)) \
+            .filter(CkanextQueryTool.type == 'related'). \
+            filter(CkanextQueryToolVisualizations.charts != '')
 
     result = query.all()
     querytools_list = []

ckanext/querytool/templates/querytool/admin/base_list.html

@@ -20,7 +20,16 @@
 
 
 {% block primary_content_inner %}
+  <legend>{{ _('Main') }}</legend>
   {% for querytool in data %}
-       {% snippet 'querytool/admin/snippets/query_tools.html', querytool=querytool %}
+    {% if querytool.type == 'main' %}
+      {% snippet 'querytool/admin/snippets/query_tools.html', querytool=querytool %}
+    {% endif %}
+  {% endfor%}
+  <legend>{{ _('Related') }}</legend>
+  {% for querytool in data %}
+    {% if querytool.type == 'related' %}
+      {% snippet 'querytool/admin/snippets/query_tools.html', querytool=querytool %}
+    {% endif %}
   {% endfor%}
 {% endblock %}

ckanext/querytool/templates/querytool/admin/snippets/edit_data_form.html

@@ -71,7 +71,7 @@
     <div class="controls">
       <select id="field-related-querytool" name="related_querytool" disabled>
         <option value="">&mdash; {{ _('Select Querytool') }} &mdash;</option>
-        {% for querytool in h.querytool_get_available_related_querytools() %}
+        {% for querytool in h.querytool_get_available_related_querytools(querytool.name) %}
           <option value="{{ querytool.name }}" {{ 'selected' if querytool.name == data.related_querytool }}>{{ querytool.title }}</option>
         {% endfor %}
       </select>