diff --git a/static/plugin_dbui/CHANGELOG b/static/plugin_dbui/CHANGELOG index de998efe8a0650bab64aca0d6371b7947151a5d6..3b8a00507bd472f6c5dc9db0f2d87395e625cacd 100644 --- a/static/plugin_dbui/CHANGELOG +++ b/static/plugin_dbui/CHANGELOG @@ -2,7 +2,7 @@ HEAD -0.6.0.15 (Mar 2014) +0.6.0.16 (Mar 2014) - Major release running with ExtJS 4.2.1 It is not compatible with with previous versions running wiht ExtJS 3.4. It relies on the new class system of the Ext JS 4 library as well as diff --git a/static/plugin_dbui/src/App.js b/static/plugin_dbui/src/App.js index e0109b29a4a8819ea3bd3d559225d2bba2379f1b..dd335e4a14ab58e4e3571de0c9e22f208b13cdb3 100644 --- a/static/plugin_dbui/src/App.js +++ b/static/plugin_dbui/src/App.js @@ -9,7 +9,7 @@ Ext.define('App', { * The version of the plugin * @property {String} */ - version: '0.6.0.15', + version: '0.6.0.16', /** * The name of the application diff --git a/static/plugin_dbui/src/panel/WithUrlSelector.js b/static/plugin_dbui/src/panel/WithUrlSelector.js index 9f121b2e0e68cabc24a4804c6dae398bdba11d00..6d2b2e2778d415c011c4c0603bf607b3a1523996 100644 --- a/static/plugin_dbui/src/panel/WithUrlSelector.js +++ b/static/plugin_dbui/src/panel/WithUrlSelector.js @@ -181,7 +181,8 @@ Ext.define('App.panel.WithUrlSelector', { var iframe, mask, request, - url; + url, + vars; // destroy embedded IFRAME in the mainPanel if any iframe = this.mainPanel.getEl().getById('mainPanelIframe'); @@ -206,7 +207,6 @@ Ext.define('App.panel.WithUrlSelector', { }; this.mainPanel.getLoader().load({ - baseParams: this.baseParams, loadMask: mask, params: request.vars, url: request.http, @@ -226,7 +226,8 @@ Ext.define('App.panel.WithUrlSelector', { }); // build the URL using the GET method - url = request.http + '?' + Ext.Object.toQueryString(request.vars); + vars = Ext.Object.merge(request.vars, this.baseParams); + url = request.http + '?' + Ext.Object.toQueryString(vars); // append the IFRAME to the main panel therefore // the browser will launch the downloading. diff --git a/views/reports/report_2.latex b/views/reports/report_2.latex index dbc18fdf1018ef049d408b4ec0ec4a54b48a765c..0eaf77db0485dc052932fb8f102f86142c0770ef 100644 --- a/views/reports/report_2.latex +++ b/views/reports/report_2.latex @@ -3,9 +3,14 @@ \usepackage[utf8]{inputenc} \usepackage{babel} \begin{document} -\section*{Test} +\section*{selector} \begin{enumerate} {{for k in test:}}\item {{=k.replace('_', ' ')}}: {{=test[k]}} {{pass}} \end{enumerate} +\section*{request.vars} +\begin{enumerate} + {{for k in vars:}}\item {{=k.replace('_', ' ')}}: {{=vars[k]}} + {{pass}} +\end{enumerate} \end{document} \ No newline at end of file