From 804a907f4b21132c2b5c7865eed955df2a5e3814 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Mon, 8 Aug 2016 15:09:43 -0400 Subject: [PATCH] Repair output popup, and add Reports to the splash page Signed-off-by: Mike Rylander --- Open-ILS/src/templates/staff/t_splash.tt2 | 6 ++++++ Open-ILS/web/reports/oils_rpt_folder_window.js | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/staff/t_splash.tt2 b/Open-ILS/src/templates/staff/t_splash.tt2 index 2884ba6c0f..1ca0ea2c4c 100644 --- a/Open-ILS/src/templates/staff/t_splash.tt2 +++ b/Open-ILS/src/templates/staff/t_splash.tt2 @@ -65,6 +65,12 @@ [% l('Workstation Administration') %] +
+ + + [% l('Reports') %] + +
diff --git a/Open-ILS/web/reports/oils_rpt_folder_window.js b/Open-ILS/web/reports/oils_rpt_folder_window.js index 0fb78db968..f5e0cf8c31 100644 --- a/Open-ILS/web/reports/oils_rpt_folder_window.js +++ b/Open-ILS/web/reports/oils_rpt_folder_window.js @@ -390,7 +390,7 @@ oilsRptFolderWindow.prototype.showOutput = function(sched) { function(r) { var url = oilsRptBuildOutputLink(r.template(), r.id(), sched.id()); _debug("launching report output view at URL: " + url); - if(isXUL()) + if(isXUL() && !window.IAMBROWSER) xulG.new_tab(xulG.url_prefix('XUL_REMOTE_BROWSER?url=') + url, {tab_name: dojo.string.substitute( rpt_strings.FOLDER_WINDOW_REPORT_OUTPUT, [r.name()] ), browser:false}, {no_xulG:false, show_nav_buttons:true, show_print_button:true}); -- 2.11.0