Yuvipanda has uploaded a new change for review. https://gerrit.wikimedia.org/r/218131
Change subject: Update compiled javascript template for previous patch ...................................................................... Update compiled javascript template for previous patch Change-Id: Ie4ab05086bb4ad9143b1d8c7ccc6a336e1856208 --- M quarry/web/static/templates/compiled.js 1 file changed, 14 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/analytics/quarry/web refs/changes/31/218131/1 diff --git a/quarry/web/static/templates/compiled.js b/quarry/web/static/templates/compiled.js index 0b04167..57a3fa5 100644 --- a/quarry/web/static/templates/compiled.js +++ b/quarry/web/static/templates/compiled.js @@ -10,25 +10,29 @@ } else { output += "\n Resultset "; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_number"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_number"), env.opts.autoescape); output += "\n "; ; } output += "\n ("; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "rowcount"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "rowcount"), env.opts.autoescape); output += " rows)\n </div>\n <div class='col-md-4'>\n <div class=\"btn-group pull-right\">\n <button type=\"button\" class=\"btn btn-info btn-xs dropdown-toggle\" data-toggle=\"dropdown\">\n Download data <span class=\"caret\"></span>\n </button>\n <ul class=\"dropdown-menu\" role=\"menu\">\n <li><a href=\"/run/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.opts.autoescape); output += "/output/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.opts.autoescape); output += "/tsv?download=true\">TSV</a></li>\n <li><a href=\"/run/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.opts.autoescape); output += "/output/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.opts.autoescape); output += "/json?download=true\">JSON</a></li>\n <li><a href=\"/run/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.autoesc); +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.opts.autoescape); output += "/output/"; -output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.autoesc); -output += "/csv?download=true\">CSV</a></li>\n </ul>\n </div>\n </div>\n </div>\n <table class='table'></table>\n</div>\n"; +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.opts.autoescape); +output += "/csv?download=true\">CSV</a></li>\n <li><a href=\"/run/"; +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "run_id"), env.opts.autoescape); +output += "/output/"; +output += runtime.suppressValue(runtime.contextOrFrameLookup(context, frame, "resultset_id"), env.opts.autoescape); +output += "/csv?download=true&encoding=utf-16\">Excel (UTF-16 CSV)</a></li>\n </ul>\n </div>\n </div>\n </div>\n <table class='table'></table>\n</div>\n"; cb(null, output); ; } catch (e) { @@ -47,7 +51,7 @@ try { if(runtime.contextOrFrameLookup(context, frame, "status") == "failed") { output += "\n<strong>Error</strong>\n<pre>"; -output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "extra")),"error", env.autoesc), env.autoesc); +output += runtime.suppressValue(runtime.memberLookup((runtime.contextOrFrameLookup(context, frame, "extra")),"error", env.opts.autoescape), env.opts.autoescape); output += "</pre>\n"; ; } -- To view, visit https://gerrit.wikimedia.org/r/218131 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie4ab05086bb4ad9143b1d8c7ccc6a336e1856208 Gerrit-PatchSet: 1 Gerrit-Project: analytics/quarry/web Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits