From: Loic Baron Date: Mon, 20 Jan 2014 15:41:51 +0000 (+0100) Subject: Activated Filters plugin QueryEditor X-Git-Tag: myslice-0.3-0~26^2~2 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=e07329eadd3e3c46d99dca2bd859e7628567b41e Activated Filters plugin QueryEditor --- diff --git a/portal/sliceview.py b/portal/sliceview.py index 60a95d39..5a47c749 100644 --- 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',