Attach datatables js/css

ckanext/datatablesview/blueprint.py

@@ -44,12 +44,12 @@ def ajax(resource_view_id):
                                    u'id': resource_view_id
                                })
 
-    draw = int(request.params[u'draw'])
-    search_text = text_type(request.params[u'search[value]'])
-    offset = int(request.params[u'start'])
-    limit = int(request.params[u'length'])
+    draw = int(request.form[u'draw'])
+    search_text = text_type(request.form[u'search[value]'])
+    offset = int(request.form[u'start'])
+    limit = int(request.form[u'length'])
     view_filters = resource_view.get(u'filters', {})
-    user_filters = text_type(request.params[u'filters'])
+    user_filters = text_type(request.form[u'filters'])
     filters = merge_filters(view_filters, user_filters)
 
     datastore_search = get_action(u'datastore_search')
@@ -68,11 +68,11 @@ def ajax(resource_view_id):
     sort_list = []
     i = 0
     while True:
-        if u'order[%d][column]' % i not in request.params:
+        if u'order[%d][column]' % i not in request.form:
             break
-        sort_by_num = int(request.params[u'order[%d][column]' % i])
+        sort_by_num = int(request.form[u'order[%d][column]' % i])
         sort_order = (
-            u'desc' if request.params[u'order[%d][dir]' %
+            u'desc' if request.form[u'order[%d][dir]' %
                                       i] == u'desc' else u'asc'
         )
         sort_list.append(cols[sort_by_num] + u' ' + sort_order)
@@ -146,8 +146,9 @@ def filtered_download(resource_view_id):
 
 
 datatablesview.add_url_rule(
-    u'/datatables/ajax/<resource_view_id>', view_func=ajax
+    u'/datatables/ajax/<resource_view_id>', view_func=ajax, methods=[u'POST']
 )
+
 datatablesview.add_url_rule(
     u'/datatables/filtered-download/<resource_view_id>',
     view_func=filtered_download

ckanext/datatablesview/public/datatables_view.css

@@ -0,0 +1,3 @@
+body {
+  background: none;
+}

ckanext/datatablesview/public/webassets.yml

@@ -1,17 +1,19 @@
 main-css:
   output: datapreview/%(version)s_main.css
   contents:
-    - vendor/Bootstrap-3.3.7/css/bootstrap.css
     - vendor/DataTables-1.10.15/css/dataTables.bootstrap.css
     - vendor/Buttons-1.3.1/css/buttons.bootstrap.css
     - vendor/FixedColumns-3.2.2/css/fixedColumns.bootstrap.css
     - vendor/FixedHeader-3.1.2/css/fixedHeader.bootstrap.css
     - vendor/KeyTable-2.2.1/css/keyTable.bootstrap.css
     - vendor/Responsive-2.1.1/css/responsive.bootstrap.css
     - vendor/Select-1.2.2/css/select.bootstrap.css
-
+    - datatables_view.css
 main-js:
   output: datapreview/%(version)s_main.js
+  extra:
+    preload:
+      - base/main
   contents:
     - vendor/Bootstrap-3.3.7/js/bootstrap.js
     - vendor/DataTables-1.10.15/js/jquery.dataTables.js

ckanext/datatablesview/templates/datatables/datatables_view.html

@@ -46,13 +46,18 @@
     </tbody>
   </table>
   <form id="filtered-datatables-download" method="POST" action="{{ h.url_for(
-      'datatablesview.filtered_download',
-      resource_view_id=resource_view.id) }}">
+                                                                  'datatablesview.filtered_download',
+                                                                  resource_view_id=resource_view.id) }}">
     <input type="hidden" name="filters" value="{{ request.args.get('filters', '')|e }}" />
   </form>
 
-  {% asset 'ckanext-datatablesview/main' %}
+
+{% endblock %}
+
+{% block styles %}
+  {{ super() }}
+  {% asset 'ckanext-datatablesview/main-css' %}
+  {% asset 'ckanext-datatablesview/main-js' %}
 {% endblock %}
 
-{% block styles %}{% endblock %}
 {% block custom_styles %}{% endblock %}