From 57295273f3737cee092a4ff802cf1d7c99f915d0 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 29 Feb 2012 18:03:08 -0500 Subject: [PATCH] Acq+Vandelay: post-upload links open in embedded browser This change causes the picklist, PO, and queue links which appear after a vendor file upload to open their respective pages with the xul browser wrapper. Without this, the existing page CSS is ignored and everything, including href's, are grey and washed out. Signed-off-by: Bill Erickson --- Open-ILS/web/js/dojo/openils/XUL.js | 2 +- Open-ILS/web/js/ui/default/acq/picklist/upload.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Open-ILS/web/js/dojo/openils/XUL.js b/Open-ILS/web/js/dojo/openils/XUL.js index 9d93f2e907..6bf2c3bf7b 100644 --- a/Open-ILS/web/js/dojo/openils/XUL.js +++ b/Open-ILS/web/js/dojo/openils/XUL.js @@ -57,7 +57,7 @@ if(!dojo._hasResource["openils.XUL"]) { var loc = xulG.url_prefix(url); if (wrap_in_browser) { - loc = urls.XUL_BROWSER + "?url=" + window.escape(loc); + loc = xulG.urls.XUL_BROWSER + "?url=" + window.escape(loc); content_params = dojo.mixin( { "no_xulG": false, "show_print_button": true, diff --git a/Open-ILS/web/js/ui/default/acq/picklist/upload.js b/Open-ILS/web/js/ui/default/acq/picklist/upload.js index c6b83d5d8c..27f448f401 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js @@ -131,7 +131,7 @@ function acqHandlePostUpload(key, plId) { link.setAttribute('href', url); } else { link.setAttribute('href', 'javascript:;'); // for linky-ness - link.onclick = function() { openils.XUL.newTabEasy(url) }; + link.onclick = function() { openils.XUL.newTabEasy(url, null, null, true) }; } } -- 2.11.0