X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=plugins%2Fquerytable%2F__init__.py;h=f669759ddf9a1527d15344b30040c30cd1a8738c;hb=43ad3b84bb593c3263236c6b9c9f9939a6bdb95d;hp=b7b92f44a4ab629246af14babdc874cd97b0bb81;hpb=265fd105b18cfa17791352c04a8da976b2c4826f;p=myslice.git

diff --git a/plugins/querytable/__init__.py b/plugins/querytable/__init__.py
index b7b92f44..f669759d 100644
--- a/plugins/querytable/__init__.py
+++ b/plugins/querytable/__init__.py
@@ -57,6 +57,8 @@ Current implementation makes the following assumptions
         else:
             self.columns = []
             self.hidden_columns = []
+        # needs to be json-serializable, and sets are not
+        self.columns=list(self.columns)
         self.id_key=id_key
         self.datatables_options=datatables_options
         # if checkboxes were required, we tell datatables about this column's type
@@ -84,20 +86,39 @@ Current implementation makes the following assumptions
 
     def requirements (self):
         reqs = {
-            'js_files' : [ "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", 
-                           "js/dataTables.js", "js/dataTables.bootstrap.js", "js/with-datatables.js",
-                           "js/manifold.js", "js/manifold-query.js", 
-                           "js/unfold-helper.js",
-                          # querytable.js needs to be loaded after dataTables.js as it extends 
-                          # dataTableExt.afnSortData
-                           "js/querytable.js", 
-                           ] ,
-            'css_files': [ "css/dataTables.bootstrap.css",
-                           # hopefully temporary, when/if datatables supports sPaginationType=bootstrap3
-                           # for now we use full_numbers, with our own ad hoc css 
-                           "css/dataTables.full_numbers.css",
-                           "css/querytable.css" , 
-                           ],
+            'js_files' : [ 
+                "js/spin.presets.js", "js/spin.min.js", "js/jquery.spin.js", 
+                "http://mleibman.github.io/SlickGrid/lib/jquery.event.drag-2.2.js",
+                "js/slick.core.js",
+                "js/slick.autotooltips.js",       # from plugins/
+                "js/slick.cellrangedecorator.js",       # from plugins/
+                "js/slick.cellrangeselector.js",       # from plugins/
+                "js/slick.cellcopymanager.js",       # from plugins/
+                "js/slick.cellselectionmodel.js",       # from plugins/
+                "js/slick.rowselectionmodel.js",       # from plugins/
+                "js/slick.checkboxselectcolumn.js",       # from plugins/
+                "js/slick.columnpicker.js",             # from controls/
+                "js/slick.formatters.js",
+                "js/slick.editors.js",
+                "js/slick.grid.js",
+
+#                "js/dataTables.js", "js/dataTables.bootstrap.js", "js/with-datatables.js",
+                "js/manifold.js", "js/manifold-query.js", 
+                "js/unfold-helper.js",
+                # querytable.js needs to be loaded after dataTables.js as it extends 
+                # dataTableExt.afnSortData
+                "js/querytable.js", 
+                ] ,
+            'css_files': [ 
+#                "css/dataTables.bootstrap.css",
+                # hopefully temporary, when/if datatables supports sPaginationType=bootstrap3
+                # for now we use full_numbers, with our own ad hoc css 
+#                "css/dataTables.full_numbers.css",
+                "css/querytable.css" , 
+                "http://mleibman.github.io/SlickGrid/slick.grid.css",
+#                "http://mleibman.github.io/SlickGrid/css/smoothness/jquery-ui-1.8.16.custom.css",
+#                "http://mleibman.github.io/SlickGrid/examples/examples.css",
+                ],
             }
         return reqs
 
@@ -106,4 +127,5 @@ Current implementation makes the following assumptions
         return ['plugin_uuid', 'domid', 
                 'query_uuid', 'query_all_uuid', 
                 'checkboxes', 'datatables_options', 
-                'hidden_columns', 'id_key',]
+                'columns','hidden_columns', 
+                'id_key',]