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
MyAcc: using JS confirm instead of JS Alert
[myslice.git]
/
portal
/
sliceview.py
diff --git
a/portal/sliceview.py
b/portal/sliceview.py
index
318ee34
..
60a95d3
100644
(file)
--- a/
portal/sliceview.py
+++ b/
portal/sliceview.py
@@
-59,8
+59,6
@@
class SliceView (LoginRequiredAutoLogoutView):
config=Config()
page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
config=Config()
page.add_js_chunks ('$(function() { messages.debug("manifold URL %s"); });'%(config.manifold_url()))
- page.expose_js_metadata()
-
metadata = page.get_metadata()
resource_md = metadata.details_by_object('resource')
resource_fields = [column['name'] for column in resource_md['column']]
metadata = page.get_metadata()
resource_md = metadata.details_by_object('resource')
resource_fields = [column['name'] for column in resource_md['column']]
@@
-226,7
+224,6
@@
class SliceView (LoginRequiredAutoLogoutView):
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
- # use 'hrn' as the internal unique key for this plugin
init_key = main_query_init_key,
checkboxes = True,
datatables_options = {
init_key = main_query_init_key,
checkboxes = True,
datatables_options = {
@@
-244,9
+241,7
@@
class SliceView (LoginRequiredAutoLogoutView):
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
# this is the query at the core of the slice list
query = sq_resource,
query_all = query_resource_all,
- # use 'hrn' as the internal unique key for this plugin
- # xxx todo on querygrid as well
- # init_key = main_query_init_key,
+ init_key = main_query_init_key,
checkboxes = True,
)
checkboxes = True,
)
@@
-434,15
+429,10
@@
class SliceView (LoginRequiredAutoLogoutView):
template_env [ 'username' ] = the_user (request)
# don't forget to run the requests
template_env [ 'username' ] = the_user (request)
# don't forget to run the requests
- page.expose_queries ()
-
- # xxx create another plugin with the same query and a different layout (with_datatables)
- # show that it worls as expected, one single api call to backend and 2 refreshed views
-
+ page.expose_js_metadata()
# the prelude object in page contains a summary of the requirements() for all plugins
# define {js,css}_{files,chunks}
# the prelude object in page contains a summary of the requirements() for all plugins
# define {js,css}_{files,chunks}
-
prelude_env = page.prelude_env(
)
- template_env.update(prelude_env)
- re
sult=
render_to_response ('view-unfold1.html',template_env,
+
template_env.update(page.prelude_env()
)
+
+ re
turn
render_to_response ('view-unfold1.html',template_env,
context_instance=RequestContext(request))
context_instance=RequestContext(request))
- return result