X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=blobdiff_plain;f=portal%2Fsliceview.py;h=7d8aaf9f85e58771c0bbfbb70d468d5d785d3421;hp=44effc9ab2303eef223fefbdb146f5c36cda6d16;hb=dadf82b73ca1616e64269a2641926d89c8aaf107;hpb=a1334d41a53aec4a8bf2ebd7f3c67244eb8ac1a8

diff --git a/portal/sliceview.py b/portal/sliceview.py
index 44effc9a..7d8aaf9f 100644
--- a/portal/sliceview.py
+++ b/portal/sliceview.py
@@ -235,65 +235,34 @@ class SliceView (LoginRequiredAutoLogoutView):
         # --------------------------------------------------------------------------
         # USERS
     
-<<<<<<< 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
+#         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,
+#                 },
+#             ))
+
 # DEMO    
         # --------------------------------------------------------------------------
         # MEASUREMENTS