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 git://git.onelab.eu/myslice
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
24567f3
..
4f66dfd
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-1,31
+1,31
@@
from django.template import RequestContext
from django.shortcuts import render_to_response
from django.template import RequestContext
from django.shortcuts import render_to_response
-from
portal.templateviews
import LoginRequiredAutoLogoutView
+from
unfold.loginrequired
import LoginRequiredAutoLogoutView
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
from myslice.viewutils import topmenu_items, the_user
from unfold.page import Page
from manifold.core.query import Query, AnalyzedQuery
from myslice.viewutils import topmenu_items, the_user
-from plugins.raw
.raw
import Raw
-from plugins.stack
.stack
import Stack
-from plugins.tabs
.tabs
import Tabs
+from plugins.raw
import Raw
+from plugins.stack
import Stack
+from plugins.tabs
import Tabs
from plugins.hazelnut import Hazelnut
from plugins.resources_selected import ResourcesSelected
from plugins.hazelnut import Hazelnut
from plugins.resources_selected import ResourcesSelected
-from plugins.googlemap import GoogleMap
+from plugins.googlemap
import GoogleMap
from plugins.senslabmap.senslabmap import SensLabMap
from plugins.senslabmap.senslabmap import SensLabMap
-from plugins.querycode
.querycode
import QueryCode
+from plugins.querycode
import QueryCode
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
from plugins.query_editor import QueryEditor
from plugins.active_filters import ActiveFilters
-from plugins.quickfilter.quickfilter import QuickFilter
-from plugins.messages.messages import Messages
-#from plugins.updater import Updater
+from plugins.quickfilter import QuickFilter
+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=True
+do_query_users=False
class SliceView (LoginRequiredAutoLogoutView):
class SliceView (LoginRequiredAutoLogoutView):
@@
-33,6
+33,7
@@
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_files ( [ "js/common.functions.js" ] )
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.expose_js_metadata()
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.expose_js_metadata()
@@
-138,13
+139,13
@@
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,
},
)
resources_query_editor = QueryEditor(
page = page,
},
)
resources_query_editor = QueryEditor(
page = page,
- query =
sq_resource
,
+ query =
query_resource_all
,
title = "Select Columns",
)
resources_active_filters = ActiveFilters(
title = "Select Columns",
)
resources_active_filters = ActiveFilters(
@@
-206,11
+207,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,
},
))
},
))
@@
-236,11
+235,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,
},
))
},
))