X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=d27d67757cff96a058d478e68bb6caf9fb0a058f;hb=506d53313a317ac1af631a15f489ef6f73bfc8a4;hp=f6494070c84be9be3ffe06aaadc58a8929479879;hpb=9ac5d96ebeaa0136eb89a21f1c28c9b9c78655f9;p=myslice.git diff --git a/portal/sliceview.py b/portal/sliceview.py index f6494070..d27d6775 100644 --- a/portal/sliceview.py +++ b/portal/sliceview.py @@ -24,6 +24,9 @@ from plugins.messages.messages import Messages tmp_default_slice='ple.upmc.myslicedemo' +# temporary : turn off the users part to speed things up +do_query_users=True + class SliceView (LoginRequiredAutoLogoutView): def get (self,request, slicename=tmp_default_slice): @@ -31,6 +34,7 @@ class SliceView (LoginRequiredAutoLogoutView): page = Page(request) page.add_css_files ('css/slice-view.css') page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });') + page.add_js_chunks ('$(function() { console.log("users turned %s"); });'%"on" if do_query_users else "off") page.expose_js_metadata() metadata = page.get_metadata() @@ -51,12 +55,14 @@ class SliceView (LoginRequiredAutoLogoutView): ) query_resource_all = Query.get('resource').select(resource_fields) - query_user_all = Query.get('user').select(user_fields) + if do_query_users: + query_user_all = Query.get('user').select(user_fields) aq = AnalyzedQuery(main_query, metadata=metadata) page.enqueue_query(main_query, analyzed_query=aq) page.enqueue_query(query_resource_all) - page.enqueue_query(query_user_all) + if do_query_users: + page.enqueue_query(query_user_all) # ... and for the relations # XXX Let's hardcode resources for now @@ -201,34 +207,35 @@ class SliceView (LoginRequiredAutoLogoutView): # USERS # - tab_users = Tabs( - page = page, - domid = 'users', - outline_complete = True, - togglable = True, - title = 'Users', - active_domid = 'checkboxes2', - ) - main_stack.insert(tab_users) + if do_query_users: + tab_users = Tabs( + page = page, + domid = 'users', + outline_complete = True, + togglable = True, + title = 'Users', + active_domid = 'checkboxes2', + ) + main_stack.insert(tab_users) -# tab_users.insert(Hazelnut( -# page = page, -# title = 'Users List', -# domid = 'checkboxes2', -# # tab's sons preferably turn this off -# togglable = False, -# # this is the query at the core of the slice list -# query = sq_user, -# 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, -# }, -# )) + tab_users.insert(Hazelnut( + page = page, + title = 'Users List', + domid = 'checkboxes2', + # tab's sons preferably turn this off + togglable = False, + # this is the query at the core of the slice list + query = sq_user, + 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, + }, + )) tab_measurements = Tabs ( page = page,