From: Bill Erickson Date: Wed, 8 Feb 2012 19:37:44 +0000 (-0500) Subject: ACQ+Vandelay open picklist/PO/queue in new tab X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=0a5fa7ee518678a0e576001ff76f3763560f7ad0;p=evergreen%2Fjoelewis.git ACQ+Vandelay open picklist/PO/queue in new tab In the staff client, after a file upload, if a picklist, queue, or PO are created, make the links open their respective pages in new tabs. When not running inside the staff client, allow the links be regular href's. Signed-off-by: Bill Erickson Signed-off-by: Ben Shum --- 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 d857b62ddb..667e272d0d 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js @@ -9,6 +9,7 @@ dojo.require("dojo.io.iframe"); dojo.require('openils.User'); dojo.require('openils.widget.AutoFieldWidget'); dojo.require('openils.acq.Picklist'); +dojo.require('openils.XUL'); var VANDELAY_URL = '/vandelay-upload'; var providerWidget; @@ -117,21 +118,28 @@ function acqHandlePostUpload(key, plId) { openils.Util.hide('acq-pl-upload-progress-bar'); openils.Util.show('acq-pl-upload-complete'); + function activateLink(link, url, name) { + link = dojo.byId(link); + openils.Util.show(link); + if (name) link.innerHTML = name; + if (typeof xulG == 'undefined') { // browser + link.setAttribute('href', url); + } else { + link.setAttribute('href', 'javascript:;'); // for linky-ness + link.onclick = function() { openils.XUL.newTabEasy(url) }; + } + } + if(res.picklist_url) { - openils.Util.show('acq-pl-upload-complete-pl'); - dojo.byId('acq-pl-upload-complete-pl').setAttribute('href', res.picklist_url); + activateLink('acq-pl-upload-complete-pl', res.picklist_url); } if(res.po_url) { - openils.Util.show('acq-pl-upload-complete-po'); - dojo.byId('acq-pl-upload-complete-po').setAttribute('href', res.po_url); + activateLink('acq-pl-upload-complete-po', res.po_url); } if (res.queue_url) { - link = dojo.byId('acq-pl-upload-complete-q'); - openils.Util.show(link); - link.setAttribute('href', res.queue_url); - link.innerHTML = resp.queue.name(); + activateLink('acq-pl-upload-complete-q', res.queue_url, resp.queue.name()); } } );