X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=871947f24157cd7beb42fa082ae4b39fef204451;hb=1c6cc165d68615e58949124447b5eb8bc4c995b5;hp=820181497bd129fa155f17726983e5777e4b2ae4;hpb=ec78acf94b2f10c9f07c8e575200313c294295d6;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index 82018149..871947f2 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -32,6 +32,7 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') + page.add_js_files ( [ "js/common.functions.js" ] ) page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off")) page.expose_js_metadata() @@ -143,7 +144,7 @@ class SliceView (LoginRequiredAutoLogoutView): resources_query_editor = QueryEditor( page = page, - query = sq_resource, + query = query_resource_all, title = "Select Columns", ) resources_active_filters = ActiveFilters( @@ -205,11 +206,9 @@ class SliceView (LoginRequiredAutoLogoutView): query_all = query_user_all, checkboxes = True, datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [None, None, None, None, {'bSortable': False}], 'iDisplayLength' : 25, 'bLengthChange' : True, + 'bAutoWidth' : True, }, )) @@ -235,11 +234,9 @@ class SliceView (LoginRequiredAutoLogoutView): query = sq_measurement, checkboxes = True, datatables_options = { - # for now we turn off sorting on the checkboxes columns this way - # this of course should be automatic in hazelnut - 'aoColumns' : [None, None, None, None, {'bSortable': False}], 'iDisplayLength' : 25, 'bLengthChange' : True, + 'bAutoWidth' : True, }, ))