Activated Filters plugin QueryEditor

[myslice.git] / portal / sliceview.py

diff --git a/portal/sliceview.py b/portal/sliceview.py
index b9ac8b1..5a47c74 100644 (file)
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -23,7 +23,7 @@ from plugins.querycode               import QueryCode
 # Thierry
 # stay away from query editor for now as it seems to make things go very slow
 # see https://lists.myslice.info/pipermail/devel-myslice/2013-December/000221.html 
-#from plugins.query_editor            import QueryEditor
+from plugins.query_editor            import QueryEditor
 from plugins.active_filters          import ActiveFilters
 from plugins.quickfilter             import QuickFilter
 from plugins.messages                import Messages
@@ -162,13 +162,13 @@ class SliceView (LoginRequiredAutoLogoutView):
         # Filter Resources
        
 # turn off for now -- see above
-#        filter_query_editor = QueryEditor(
-#            page  = page,
-#            query = sq_resource, 
-#            query_all = query_resource_all,
-#            title = "Select Columns",
-#            domid = 'select-columns',
-#            )
+        filter_query_editor = QueryEditor(
+            page  = page,
+            query = sq_resource, 
+            query_all = query_resource_all,
+            title = "Select Columns",
+            domid = 'select-columns',
+            )
         filter_active_filters = ActiveFilters(
             page  = page,
             query = sq_resource,
@@ -178,7 +178,7 @@ class SliceView (LoginRequiredAutoLogoutView):
             page                = page,
             title               = 'Filter Resources',
             domid               = 'filters',
-            sons                = [# filter_query_editor, 
+            sons                = [filter_query_editor, 
                                    filter_active_filters],
             togglable           = True,
             toggled             = 'persistent',
@@ -224,7 +224,6 @@ class SliceView (LoginRequiredAutoLogoutView):
             # this is the query at the core of the slice list
             query      = sq_resource,
             query_all  = query_resource_all,
-            # use 'hrn' as the internal unique key for this plugin
             init_key     = main_query_init_key,
             checkboxes = True,
             datatables_options = { 
@@ -242,9 +241,7 @@ class SliceView (LoginRequiredAutoLogoutView):
                 # this is the query at the core of the slice list
                 query      = sq_resource,
                 query_all  = query_resource_all,
-                # use 'hrn' as the internal unique key for this plugin
-                # xxx todo on querygrid as well
-                # init_key     = main_query_init_key,
+                init_key     = main_query_init_key,
                 checkboxes = True,
                 )
 
@@ -433,7 +430,6 @@ class SliceView (LoginRequiredAutoLogoutView):
     
         # don't forget to run the requests
         page.expose_js_metadata()
-        page.expose_queries ()
         # the prelude object in page contains a summary of the requirements() for all plugins
         # define {js,css}_{files,chunks}
         template_env.update(page.prelude_env())