Disable download (#502)

Author: mpolidori

ckanext/querytool/controllers/querytool.py

@@ -248,6 +248,7 @@ def querytool_edit(self, querytool=None, data=None,
             _querytool['icon'] = data['icon']
             _querytool['selection_label'] = data.get('selection_label')
             _querytool['report_caption'] = data.get('report_caption')
+            _querytool['download_options'] = data.get('download_options')
 
             try:
                 junk = _get_action('querytool_update', _querytool)

ckanext/querytool/logic/action/update.py

@@ -27,6 +27,7 @@ def querytool_update(context, data_dict):
     :param y_axis_columns
     :param selection_label
     :param report_caption
+    :param download_options
     '''
 
     # we need the querytool name in the context for name validation
@@ -60,7 +61,7 @@ def querytool_update(context, data_dict):
              'dataset_name', 'owner_org', 'icon', 'image_url', 'image_display_url',
              'filters', 'sql_string', 'related_querytools',
              'chart_resource', 'y_axis_columns', 'additional_description', 'selection_label',
-             'report_caption']
+             'report_caption', 'download_options']
 
     dataset_name = data.get('dataset_name')
     dataset = _get_action('package_show')(context, {'id': dataset_name})

ckanext/querytool/logic/schema.py

@@ -37,4 +37,5 @@ def querytool_schema():
         'image_url': [ignore_missing, unicode],
         'selection_label': [ignore_missing, unicode],
         'report_caption': [ignore_missing, unicode],
+        'download_options': [ignore_missing, boolean_validator],
     }

ckanext/querytool/model.py

@@ -38,6 +38,7 @@ def setup():
         Session.execute('ALTER TABLE ckanext_querytool ADD COLUMN IF NOT EXISTS image_display_url TEXT;')
         Session.execute('ALTER TABLE ckanext_querytool ADD COLUMN IF NOT EXISTS selection_label TEXT;')
         Session.execute('ALTER TABLE ckanext_querytool ADD COLUMN IF NOT EXISTS report_caption TEXT;')
+        Session.execute('ALTER TABLE ckanext_querytool ADD COLUMN IF NOT EXISTS download_options BOOLEAN;')
         Session.commit()
     inspector = Inspector.from_engine(engine)
 
@@ -160,6 +161,8 @@ def define_query_tool_table():
                                     default=u''),
                              Column('report_caption', types.UnicodeText,
                                     default=u''),
+                             Column('download_options', types.Boolean,
+                                    default=True),
                              Index('ckanext_querytool_id_idx',
                                    'id'))
 

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

@@ -107,6 +107,17 @@
       </select>
     </div>
   </div>
+
+  <div class="control-group">
+    <label for="field-download" class="control-label">{{ _('Download Options') }}</label>
+    <div class="controls">
+      <select id="field-download" name="download_options">
+        {% for option in [(True, _('Enabled')), (False, _('Disabled'))] %}
+        <option value="{{ option[0] }}" {% if option[0] == data.download_options %}selected="selected"{% endif %}>{{ option[1] }}</option>
+        {% endfor %}
+      </select>
+    </div>
+  </div>
   <hr>
   <fieldset id="related_querytools">
     {% if data.related_querytools  %}

ckanext/querytool/templates/querytool/public/read.html

@@ -112,7 +112,10 @@ <h1>{{ querytools[0].title }}</h1>
 
     <div class="controls-wrap" id="{{ querytool.name }}" >
         <div class="btn-download">
-            <div class="btn-group dropdown">
+
+              {% set show_download = querytool.download_options %}
+              {% if show_download == true %}
+              <div class="btn-group dropdown">
                 <button class="btn btn-round dropdown-toggle" data-toggle="dropdown" href="#">
                   {{ _('Download') }} <img src="/base/images/download.svg" width="15" /> 
                 </button>
@@ -140,7 +143,8 @@ <h1>{{ querytools[0].title }}</h1>
                   </li>
                 </ul>
               </div>
-
+              {% endif %}
+              
               <button class="btn btn-round" href="#embed-{{ querytools[0].name }}" 
               data-module="tool-embed" 
               data-module-id="{{ querytools[0].id }}" >{{ _('Share') }} <img src="/base/images/share.svg" width="15"/> </button>