git://git.onelab.eu
/
unfold.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
slice resource view: pending changes, queryupdater plugin, not toggable
[unfold.git]
/
portal
/
sliceresourceview.py
diff --git
a/portal/sliceresourceview.py
b/portal/sliceresourceview.py
index
254e2fd
..
2034eac
100644
(file)
--- a/
portal/sliceresourceview.py
+++ b/
portal/sliceresourceview.py
@@
-50,7
+50,7
@@
class SliceResourceView (LoginRequiredView, ThemeView):
'resource.hostname', 'resource.type',
'resource.network_hrn',
'lease.urn',
'resource.hostname', 'resource.type',
'resource.network_hrn',
'lease.urn',
- 'user.user_hrn',
+
#
'user.user_hrn',
#'application.measurement_point.counter'
)
# for internal use in the querytable plugin;
#'application.measurement_point.counter'
)
# for internal use in the querytable plugin;
@@
-68,8
+68,8
@@
class SliceResourceView (LoginRequiredView, ThemeView):
lease_md = metadata.details_by_object('lease')
lease_fields = [column['name'] for column in lease_md['column']]
lease_md = metadata.details_by_object('lease')
lease_fields = [column['name'] for column in lease_md['column']]
- query_
all_lease
= Query.get('lease').select(lease_fields)
- page.enqueue_query(query_
all_lease
)
+ query_
lease_all
= Query.get('lease').select(lease_fields)
+ page.enqueue_query(query_
lease_all
)
# --------------------------------------------------------------------------
# ALL RESOURCES LIST
# --------------------------------------------------------------------------
# ALL RESOURCES LIST
@@
-143,7
+143,7
@@
class SliceResourceView (LoginRequiredView, ThemeView):
# center on Paris
latitude = 49.,
longitude = 9,
# center on Paris
latitude = 49.,
longitude = 9,
- zoom =
4
,
+ zoom =
8
,
)
# --------------------------------------------------------------------------
)
# --------------------------------------------------------------------------
@@
-156,8
+156,9
@@
class SliceResourceView (LoginRequiredView, ThemeView):
title = 'Scheduler',
# this is the query at the core of the slice list
query = sq_resource,
title = 'Scheduler',
# this is the query at the core of the slice list
query = sq_resource,
+ query_lease = sq_lease,
query_all_resources = query_resource_all,
query_all_resources = query_resource_all,
- query_
lease = query_all_lease
,
+ query_
all_leases = query_lease_all
,
)
# --------------------------------------------------------------------------
)
# --------------------------------------------------------------------------
@@
-167,7
+168,7
@@
class SliceResourceView (LoginRequiredView, ThemeView):
page = page,
title = 'Pending operations',
query = main_query,
page = page,
title = 'Pending operations',
query = main_query,
- togglable =
Tru
e,
+ togglable =
Fals
e,
# start turned off, it will open up itself when stuff comes in
toggled = False,
domid = 'pending',
# start turned off, it will open up itself when stuff comes in
toggled = False,
domid = 'pending',
@@
-202,7
+203,7
@@
class SliceResourceView (LoginRequiredView, ThemeView):
template_env = {}
template_env['list_resources'] = list_resources.render(self.request)
template_env = {}
template_env['list_resources'] = list_resources.render(self.request)
- template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
+
#
template_env['list_reserved_resources'] = list_reserved_resources.render(self.request)
template_env['columns_editor'] = filter_column_editor.render(self.request)
template_env['columns_editor'] = filter_column_editor.render(self.request)