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
b265e79
..
a4efdbd
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-6,7
+6,7
@@
from unfold.loginrequired import LoginRequiredAutoLogoutView
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
-from
myslice.viewutils
import topmenu_items, the_user
+from
ui.topmenu
import topmenu_items, the_user
from plugins.raw import Raw
from plugins.stack import Stack
from plugins.raw import Raw
from plugins.stack import Stack
@@
-21,6
+21,8
@@
from plugins.active_filters import ActiveFilters
from plugins.quickfilter import QuickFilter
from plugins.messages import Messages
from plugins.quickfilter import QuickFilter
from plugins.messages import Messages
+from myslice.config import Config
+
tmp_default_slice='ple.upmc.myslicedemo'
# temporary : turn off the users part to speed things up
tmp_default_slice='ple.upmc.myslicedemo'
# temporary : turn off the users part to speed things up
@@
-32,8
+34,10
@@
class SliceView (LoginRequiredAutoLogoutView):
page = Page(request)
page.add_css_files ('css/slice-view.css')
page = Page(request)
page.add_css_files ('css/slice-view.css')
- page.add_js_chunks ('$(function() { console.log("sliceview: jQuery version " + $.fn.jquery); });')
- page.add_js_chunks ('$(function() { console.log("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+ page.add_js_files ( [ "js/common.functions.js" ] )
+ page.add_js_chunks ('$(function() { messages.debug("sliceview: jQuery version " + $.fn.jquery); });')
+ page.add_js_chunks ('$(function() { messages.debug("sliceview: users turned %s"); });'%("on" if do_query_users else "off"))
+ page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(Config.manifold_url()))
page.expose_js_metadata()
metadata = page.get_metadata()
page.expose_js_metadata()
metadata = page.get_metadata()
@@
-47,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'
@@
-101,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,
))
@@
-120,8
+127,8
@@
class SliceView (LoginRequiredAutoLogoutView):
checkboxes = True,
# center on Paris
latitude = 49.,
checkboxes = True,
# center on Paris
latitude = 49.,
- longitude =
2.2
,
- zoom =
3
,
+ longitude =
9
,
+ zoom =
4
,
)
resources_as_list = Hazelnut(
)
resources_as_list = Hazelnut(
@@
-132,19
+139,17
@@
class SliceView (LoginRequiredAutoLogoutView):
query_all = query_resource_all,
checkboxes = True,
datatables_options = {
query_all = query_resource_all,
checkboxes = True,
datatables_options = {
- # for now we turn off sorting on the checkboxes columns this way
- # this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength': 25,
'bLengthChange' : True,
'iDisplayLength': 25,
'bLengthChange' : True,
- 'bAut
i
Width' : True,
+ 'bAut
o
Width' : True,
},
)
resources_query_editor = QueryEditor(
page = page,
},
)
resources_query_editor = QueryEditor(
page = page,
- query =
sq_resource
,
+ query =
query_resource_all
,
title = "Select Columns",
title = "Select Columns",
+ domid = 'select-columns',
)
resources_active_filters = ActiveFilters(
page = page,
)
resources_active_filters = ActiveFilters(
page = page,
@@
-190,14
+195,14
@@
class SliceView (LoginRequiredAutoLogoutView):
outline_complete = True,
togglable = True,
title = 'Users',
outline_complete = True,
togglable = True,
title = 'Users',
- active_domid = '
checkboxes2
',
+ active_domid = '
users-list
',
)
main_stack.insert(tab_users)
tab_users.insert(Hazelnut(
page = page,
title = 'Users List',
)
main_stack.insert(tab_users)
tab_users.insert(Hazelnut(
page = page,
title = 'Users List',
- domid = '
checkboxes2
',
+ domid = '
users-list
',
# tab's sons preferably turn this off
togglable = False,
# this is the query at the core of the slice list
# tab's sons preferably turn this off
togglable = False,
# this is the query at the core of the slice list
@@
-205,11
+210,9
@@
class SliceView (LoginRequiredAutoLogoutView):
query_all = query_user_all,
checkboxes = True,
datatables_options = {
query_all = query_user_all,
checkboxes = True,
datatables_options = {
- # for now we turn off sorting on the checkboxes columns this way
- # this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength' : 25,
'bLengthChange' : True,
'iDisplayLength' : 25,
'bLengthChange' : True,
+ 'bAutoWidth' : True,
},
))
},
))
@@
-217,7
+220,7
@@
class SliceView (LoginRequiredAutoLogoutView):
# MEASUREMENTS
tab_measurements = Tabs (
page = page,
# MEASUREMENTS
tab_measurements = Tabs (
page = page,
- active_domid = '
checkboxes3
',
+ active_domid = '
measurements-list
',
outline_complete = True,
togglable = True,
title = 'Measurements',
outline_complete = True,
togglable = True,
title = 'Measurements',
@@
-228,18
+231,18
@@
class SliceView (LoginRequiredAutoLogoutView):
tab_measurements.insert(Hazelnut(
page = page,
title = 'Measurements',
tab_measurements.insert(Hazelnut(
page = page,
title = 'Measurements',
- domid = '
checkboxes3
',
+ domid = '
measurements-list
',
# tab's sons preferably turn this off
togglable = False,
# this is the query at the core of the slice list
query = sq_measurement,
# tab's sons preferably turn this off
togglable = False,
# this is the query at the core of the slice list
query = sq_measurement,
+ # do NOT set checkboxes to False
+ # this table being otherwise empty, it just does not fly with dataTables
checkboxes = True,
datatables_options = {
checkboxes = True,
datatables_options = {
- # for now we turn off sorting on the checkboxes columns this way
- # this of course should be automatic in hazelnut
- 'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength' : 25,
'bLengthChange' : True,
'iDisplayLength' : 25,
'bLengthChange' : True,
+ 'bAutoWidth' : True,
},
))
},
))