plugins.hazelnut: fixed to work without having a query

[myslice.git] / trash / sliceview.py

diff --git a/trash/sliceview.py b/trash/sliceview.py
index 252291f..759d20b 100644 (file)
--- a/trash/sliceview.py
+++ b/trash/sliceview.py
@@ -54,7 +54,7 @@ def _slice_view (request, slicename):
 
     # TODO The query to run is embedded in the URL
     main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
-    query_resource_all = Query.get('resource').select('resource_hrn', 'hostname', 'type', 'authority')
+    query_resource_all = Query.get('resource').select('resource_hrn', 'hostname', 'type', 'network_hrn', 'latitude', 'longitude')
 
     # Get default fields from metadata unless specified
     if not main_query.fields:
@@ -65,8 +65,8 @@ def _slice_view (request, slicename):
         # TODO Get default fields
         main_query.select(
                 'slice_hrn',
-                'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.authority',
-                'lease.urn',
+                'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn',
+                #'lease.urn',
                 'user.user_hrn',
 #                'application.measurement_point.counter'
         )
@@ -159,6 +159,8 @@ def _slice_view (request, slicename):
         # tab's sons preferably turn this off
         togglable   = False,
         query       = sq_resource,
+        query_all_uuid = query_resource_all.query_uuid,
+        checkboxes     = True,
         # center on Paris
         latitude    = 49.,
         longitude   = 2.2,
@@ -254,113 +256,6 @@ def _slice_view (request, slicename):
     ))
     
 
-    # END OF JORDAN's CODE
-
-#old#    main_plugin = Stack (
-#old#        page=page,
-#old#        title="Slice view for %s"%slicename,
-#old#        domid='thestack',
-#old#        togglable=False,
-#old#        sons=[
-#old#            Raw (page=page,togglable=False, toggled=True,html="<h2> Slice page for %s</h2>"%slicename),
-#old#            Messages (
-#old#                page=page,
-#old#                title="Runtime messages for slice %s"%slicename,
-#old#                domid="msgs-pre",
-#old#                levels="ALL",
-#old#                ),
-#old#            Tabs (
-#old#                page=page,
-#old#                title="2 tabs : w/ and w/o checkboxes",
-#old#                domid='thetabs',
-#old#                # active_domid='checkboxes',
-#old#                active_domid='gmap',
-#old#                sons=[
-#old#                    Hazelnut ( 
-#old#                        page=page,
-#old#                        title='a sample and simple hazelnut',
-#old#                        domid='simple',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        # this is the query at the core of the slice list
-#old#                        query=main_query,
-#old#                        ),
-#old#                    Hazelnut ( 
-#old#                        page=page,
-#old#                        title='with checkboxes',
-#old#                        domid='checkboxes',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        # this is the query at the core of the slice list
-#old#                        query=main_query,
-#old#                        checkboxes=True,
-#old#                        datatables_options = { 
-#old#                            # for now we turn off sorting on the checkboxes columns this way
-#old#                            # this of course should be automatic in hazelnut
-#old#                            'aoColumns' : [ None, None, None, None, {'bSortable': False} ],
-#old#                            'iDisplayLength' : 25,
-#old#                            'bLengthChange' : True,
-#old#                            },
-#old#                        ),
-#old#                    GoogleMap (
-#old#                        page=page,
-#old#                        title='geographic view',
-#old#                        domid='gmap',
-#old#                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old#                        query=main_query,
-#old#                        # center on Paris
-#old#                        latitude=49.,
-#old#                        longitude=2.2,
-#old#                        zoom=3,
-#old#                        ),
-#old#                    Raw (
-#old##                    SensLabMap (
-#old#                        page=page,
-#old#                        title='3D view (disabled)',
-#old#                        domid='smap',
-#old##                        # tab's sons preferably turn this off
-#old#                        togglable=False,
-#old##                        query=main_query,
-#old#                        html="""<p class='well'>
-#old#Thierry: I am commeting off the use of <button class="btn btn-danger">SensLabMap</button> which,
-#old# although rudimentarily ported to the django framework, 
-#old#causes a weird behaviour especially wrt scrolling. 
-#old#On my Mac <button class="btn btn-warning"> I cannot use the mouse to scroll</button> any longer
-#old#if I keep this active, so for now it's disabled
-#old#</p>""",
-#old#                        ),
-#old#                    ]),
-#old#            Hazelnut ( 
-#old#                page=page,
-#old#                title='a hazelnut not in tabs',
-#old#                domid='standalone',
-#old#                # this is the query at the core of the slice list
-#old#                query=main_query,
-#old#                columns=['hrn','hostname'],
-#old#                ),
-#old#              # you don't *have to* set a domid, but if you plan on using toggled=persistent then it's required
-#old#              # because domid is the key for storing toggle status in the browser
-#old#            QueryCode (
-#old#                page=page,
-#old#                title='xmlrpc code (toggled=False)',
-#old#                query=main_query,
-#old##                domid='xmlrpc',
-#old#                toggled=False,
-#old#                ),
-#old#            QuickFilter (
-#old#                page=page,
-#old#                title="QuickFilter - requires metadata (toggled=False)",
-#old#                criterias=quickfilter_criterias,
-#old#                domid='filters',
-#old#                toggled=False,
-#old#                ),
-#old#            Messages (
-#old#                page=page,
-#old#                title="Runtime messages (again)",
-#old#                domid="msgs-post",
-#old#                )
-#old#              ])
 
     # variables that will get passed to the view-unfold1.html template
     template_env = {}
@@ -371,7 +266,7 @@ def _slice_view (request, slicename):
     # more general variables expected in the template
     template_env [ 'title' ] = 'Test view that combines various plugins'
     # the menu items on the top
-    template_env [ 'topmenu_items' ] = topmenu_items('slice', request) 
+    template_env [ 'topmenu_items' ] = topmenu_items('Slice', request) 
     # so we can sho who is logged
     template_env [ 'username' ] = the_user (request)