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
Merge branch 'master' of ssh://git.onelab.eu/git/myslice
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
9c2ba60
..
a4efdbd
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-51,7
+51,8
@@
class SliceView (LoginRequiredAutoLogoutView):
main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
main_query.select(
'slice_hrn',
main_query = Query.get('slice').filter_by('slice_hrn', '=', slicename)
main_query.select(
'slice_hrn',
- 'resource.resource_hrn', 'resource.hostname', 'resource.type', 'resource.network_hrn',
+ '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'
@@
-105,6
+106,8
@@
class SliceView (LoginRequiredAutoLogoutView):
title = 'Pending operations',
query = main_query,
togglable = True,
title = 'Pending operations',
query = main_query,
togglable = True,
+ # start turned off, it will open up itself when stuff comes in
+ toggled = False,
domid = 'pending',
outline_complete = True,
))
domid = 'pending',
outline_complete = True,
))
@@
-146,6
+149,7
@@
class SliceView (LoginRequiredAutoLogoutView):
page = page,
query = query_resource_all,
title = "Select Columns",
page = page,
query = query_resource_all,
title = "Select Columns",
+ domid = 'select-columns',
)
resources_active_filters = ActiveFilters(
page = page,
)
resources_active_filters = ActiveFilters(
page = page,