From: Jordan Augé Date: Tue, 13 Aug 2013 14:42:47 +0000 (+0200) Subject: Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan X-Git-Tag: myslice-0.2-1~57^2 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f1ab05190b0624b8e6fa5d6b960c4ffdc6da37a8;hp=16b0e6f051984c6272943442a0b4b3c0b1668723;p=myslice.git Merge branch 'jordan' of ssh://git.onelab.eu/git/myslice into jordan --- diff --git a/plugins/updater/static/js/updater.js b/plugins/updater/static/js/updater.js index 5a00ffde..d14d5d8b 100644 --- a/plugins/updater/static/js/updater.js +++ b/plugins/updater/static/js/updater.js @@ -1,12 +1,10 @@ /** - * Description: associate with a Get query, maintains the 'Update' query that records pending changes - * Copyright (c) 2012 UPMC Sorbonne Universite - INRIA + * Description: Manage query updates + * Copyright (c) 2012-2013 UPMC Sorbonne Universite - INRIA * License: GPLv3 */ -// xxx this is ongoing work, very rough, and not working at all yet - -( function ( $ ) { +(function( $ ) { var debug=false; // debug=true diff --git a/portal/views.py b/portal/views.py index 2dc53247..e12da186 100644 --- a/portal/views.py +++ b/portal/views.py @@ -62,6 +62,7 @@ class DashboardView(TemplateView): page.enqueue_query(slice_query) page.enqueue_query(auth_query) + page.expose_js_metadata() page.expose_queries() slicelist = SimpleList(