git://git.onelab.eu
/
myslice.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
portal: updated views
[myslice.git]
/
trash
/
sliceview.py
diff --git
a/trash/sliceview.py
b/trash/sliceview.py
index
b171487
..
0036221
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)
# 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:
# Get default fields from metadata unless specified
if not main_query.fields:
@@
-65,7
+65,7
@@
def _slice_view (request, slicename):
# TODO Get default fields
main_query.select(
'slice_hrn',
# TODO Get default fields
main_query.select(
'slice_hrn',
- 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.
authority
',
+ 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.
network_hrn
',
#'lease.urn',
'user.user_hrn',
# 'application.measurement_point.counter'
#'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,
# 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,
# center on Paris
latitude = 49.,
longitude = 2.2,