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
move former myslice/viewutils.py, to gether with the contents of former views/ subdir...
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
97802f6
..
175a40e
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
@@
-24,8
+24,7
@@
from plugins.messages import Messages
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
-#do_query_users=True
-do_query_users=False
+do_query_users=True
class SliceView (LoginRequiredAutoLogoutView):
class SliceView (LoginRequiredAutoLogoutView):
@@
-122,8
+121,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(
@@
-139,7
+138,7
@@
class SliceView (LoginRequiredAutoLogoutView):
'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength': 25,
'bLengthChange' : True,
'aoColumns' : [None, None, None, None, {'bSortable': False}],
'iDisplayLength': 25,
'bLengthChange' : True,
- 'bAut
i
Width' : True,
+ 'bAut
o
Width' : True,
},
)
},
)
@@
-207,11
+206,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,
},
))
},
))
@@
-237,11
+234,9
@@
class SliceView (LoginRequiredAutoLogoutView):
query = sq_measurement,
checkboxes = True,
datatables_options = {
query = sq_measurement,
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,
},
))
},
))