From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Tue, 1 Oct 2013 12:39:20 +0000 (+0200)
Subject: Merge branch 'configfile' into checkboxes
X-Git-Tag: myslice-0.2-5~61
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a387c58445b7cde5ecf05a022c5a875645eeb463;hp=-c;p=unfold.git

Merge branch 'configfile' into checkboxes
---

a387c58445b7cde5ecf05a022c5a875645eeb463
diff --combined portal/sliceview.py
index 1eb6778e,74101f2c..0e514dd9
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@@ -21,6 -21,8 +21,8 @@@ from plugins.active_filters          im
  from plugins.quickfilter             import QuickFilter
  from plugins.messages                import Messages
  
+ from myslice.config                  import Config
+ 
  tmp_default_slice='ple.upmc.myslicedemo'
  
  # temporary : turn off the users part to speed things up
@@@ -33,8 -35,9 +35,9 @@@ class SliceView (LoginRequiredAutoLogou
          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.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
+         page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+         page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url()))
          page.expose_js_metadata()
      
          metadata = page.get_metadata()
@@@ -133,6 -136,9 +136,6 @@@
              query_all  = query_resource_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,
@@@ -188,14 -194,14 +191,14 @@@
                  outline_complete    = True,
                  togglable           = True,
                  title               = 'Users',
 -                active_domid        = 'checkboxes2',
 +                active_domid        = 'users-list',
                  )
              main_stack.insert(tab_users)
      
              tab_users.insert(Hazelnut( 
                  page        = page,
                  title       = 'Users List',
 -                domid       = 'checkboxes2',
 +                domid       = 'users-list',
                  # tab's sons preferably turn this off
                  togglable   = False,
                  # this is the query at the core of the slice list
@@@ -213,7 -219,7 +216,7 @@@
          # MEASUREMENTS
          tab_measurements = Tabs (
              page                = page,
 -            active_domid        = 'checkboxes3',
 +            active_domid        = 'measurements-list',
              outline_complete    = True,
              togglable           = True,
              title               = 'Measurements',
@@@ -224,7 -230,7 +227,7 @@@
          tab_measurements.insert(Hazelnut( 
              page        = page,
              title       = 'Measurements',
 -            domid       = 'checkboxes3',
 +            domid       = 'measurements-list',
              # tab's sons preferably turn this off
              togglable   = False,
              # this is the query at the core of the slice list