X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=portal%2Fsliceview.py;h=4f66dfdc37036e416b4a677526f623c9cb074307;hb=15ca59cb1f80be244df33026add2cf97f2f87a62;hp=5e8ddf9b59349f0982c7b4341b2fb9d80bd5e809;hpb=937653fd70bbf7d95bcf870e7f2b46b4a8fec486;p=myslice.git

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 5e8ddf9b..4f66dfdc 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -1,7 +1,7 @@
 from django.template                 import RequestContext
 from django.shortcuts                import render_to_response
 
-from views.loginrequired             import LoginRequiredAutoLogoutView
+from unfold.loginrequired            import LoginRequiredAutoLogoutView
 
 from unfold.page                     import Page
 from manifold.core.query             import Query, AnalyzedQuery
@@ -24,7 +24,8 @@ from plugins.messages                import Messages
 tmp_default_slice='ple.upmc.myslicedemo'
 
 # temporary : turn off the users part to speed things up
-do_query_users=True
+#do_query_users=True
+do_query_users=False
 
 class SliceView (LoginRequiredAutoLogoutView):
 
@@ -32,6 +33,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()
@@ -137,13 +139,13 @@ class SliceView (LoginRequiredAutoLogoutView):
                 'aoColumns'     : [None, None, None, None, {'bSortable': False}],
                 'iDisplayLength': 25,
                 'bLengthChange' : True,
-                'bAutiWidth'    : True,
+                'bAutoWidth'    : True,
                 },
             )
 
         resources_query_editor = QueryEditor(
             page  = page,
-            query = sq_resource,
+            query = query_resource_all,
             title = "Select Columns",
             )
         resources_active_filters = ActiveFilters(
@@ -205,11 +207,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 +235,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,
             },
         ))