From: Ciro Scognamiglio <ciro.scognamiglio@cslash.net>
Date: Fri, 25 Oct 2013 17:22:40 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/myslice
X-Git-Tag: 0.2-6~6
X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8

Merge branch 'master' of ssh://git.onelab.eu/git/myslice

Conflicts:
	portal/sliceview.py
---

a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8
diff --cc portal/sliceview.py
index 8767e8b2,15a5e51a..44effc9a
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@@ -234,35 -190,34 +235,65 @@@ class SliceView (LoginRequiredAutoLogou
          # --------------------------------------------------------------------------
          # USERS
      
 -#        if do_query_users:
 -#            tab_users = Tabs(
 -#                page                = page,
 -#                domid               = 'users',
 -#                outline_complete    = True,
 -#                togglable           = True,
 -#                title               = 'Users',
 -#                active_domid        = 'users-list',
 -#                )
 -#            main_stack.insert(tab_users)
 -#    
 -#            tab_users.insert(Hazelnut( 
 -#                page        = page,
 -#                title       = 'Users List',
 -#                domid       = 'users-list',
 -#                # 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 = { 
 -#                    'iDisplayLength' : 25,
 -#                    'bLengthChange'  : True,
 -#                    'bAutoWidth'     : True,
 -#                },
 -#            ))
++<<<<<<< HEAD
 +        if do_query_users:
 +            tab_users = Tabs(
 +                page                = page,
 +                domid               = 'users',
 +                outline_complete    = True,
 +                togglable           = True,
 +                title               = 'Users',
 +                active_domid        = 'users-list',
 +                )
 +            main_stack.insert(tab_users)
 +    
 +            tab_users.insert(Hazelnut( 
 +                page        = page,
 +                title       = 'Users List',
 +                domid       = 'users-list',
 +                # 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 = { 
 +                    'iDisplayLength' : 25,
 +                    'bLengthChange'  : True,
 +                    'bAutoWidth'     : True,
 +                },
 +            ))
 +            
 +        
++=======
++        if do_query_users:
++            tab_users = Tabs(
++                page                = page,
++                domid               = 'users',
++                outline_complete    = True,
++                togglable           = True,
++                title               = 'Users',
++                active_domid        = 'users-list',
++                )
++            main_stack.insert(tab_users)
++    
++            tab_users.insert(Hazelnut( 
++                page        = page,
++                title       = 'Users List',
++                domid       = 'users-list',
++                # 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 = { 
++                    'iDisplayLength' : 25,
++                    'bLengthChange'  : True,
++                    'bAutoWidth'     : True,
++                },
++            ))
++>>>>>>> 0c8a634162f3271018102e75a3934c5db5e48f59
  # DEMO    
          # --------------------------------------------------------------------------
          # MEASUREMENTS