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
Merge branch 'master' into scheduler
[unfold.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
9eb4799
..
42cc8ba
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-15,6
+15,7
@@
from plugins.querytable import QueryTable
from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
from plugins.queryupdater import QueryUpdater
from plugins.googlemap import GoogleMap
from plugins.senslabmap import SensLabMap
+from plugins.scheduler import Scheduler
from plugins.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
from plugins.querycode import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
@@
-59,7
+60,7
@@
class SliceView (LoginRequiredAutoLogoutView):
'slice_hrn',
'resource.hrn', 'resource.hostname', 'resource.type',
'resource.network_hrn',
'slice_hrn',
'resource.hrn', 'resource.hostname', 'resource.type',
'resource.network_hrn',
-
#
'lease.urn',
+ 'lease.urn',
'user.user_hrn',
#'application.measurement_point.counter'
)
'user.user_hrn',
#'application.measurement_point.counter'
)
@@
-156,6
+157,7
@@
class SliceView (LoginRequiredAutoLogoutView):
togglable = False,
query = sq_resource,
query_all = query_resource_all,
togglable = False,
query = sq_resource,
query_all = query_resource_all,
+ googlemap_api_key = Config().googlemap_api_key(),
checkboxes = True,
# center on Paris
latitude = 49.,
checkboxes = True,
# center on Paris
latitude = 49.,
@@
-186,6
+188,15
@@
class SliceView (LoginRequiredAutoLogoutView):
},
)
},
)
+ resources_as_scheduler = Scheduler(
+ page = page,
+ title = 'Scheduler',
+ domid = 'scheduler',
+ query = sq_resource,
+ query_all_resources = query_resource_all,
+ query_lease = sq_lease,
+ )
+
# with the new 'Filter' stuff on top, no need for anything but the querytable
resources_as_list_area = resources_as_list
# with the new 'Filter' stuff on top, no need for anything but the querytable
resources_as_list_area = resources_as_list
@@
-194,10
+205,13
@@
class SliceView (LoginRequiredAutoLogoutView):
togglable=True,
title="Resources",
outline_complete=True,
togglable=True,
title="Resources",
outline_complete=True,
- sons=[ resources_as_gmap,
- resources_as_3dmap,
+ sons=[
+ resources_as_scheduler,
+ #resources_as_gmap,
+ #resources_as_3dmap,
resources_as_list_area, ],
active_domid = 'resources-map',
resources_as_list_area, ],
active_domid = 'resources-map',
+ persistent_active=True,
)
main_stack.insert (resources_area)
)
main_stack.insert (resources_area)