From: erickson Date: Tue, 13 Apr 2010 13:59:29 +0000 (+0000) Subject: use oilsBasePath consistently for relative url support X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6088b6d32aa6566d002289117e3b77857103807d;p=evergreen%2Fmasslnc.git use oilsBasePath consistently for relative url support git-svn-id: svn://svn.open-ils.org/ILS/trunk@16222 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js index 7fcaaf356f..1393933196 100644 --- a/Open-ILS/web/js/ui/default/acq/common/li_table.js +++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js @@ -212,7 +212,7 @@ function AcqLiTable() { } nodeByName("worksheet_link", row).href = - "/eg/acq/lineitem/worksheet/" + li.id(); + oilsBasePath + "/acq/lineitem/worksheet/" + li.id(); dojo.query('[attr=title]', row)[0].onclick = function() {self.drawInfo(li.id())}; dojo.query('[name=copieslink]', row)[0].onclick = function() {self.drawCopies(li.id())}; @@ -694,7 +694,7 @@ function AcqLiTable() { if (!this._isRelatedViewer) { nodeByName("rel_link", dojo.byId("acq-lit-info-related")).href = - "/eg/acq/lineitem/related/" + li.id(); + oilsBasePath + "/acq/lineitem/related/" + li.id(); } if(li.eg_bib_id()) { @@ -2024,7 +2024,7 @@ function AcqLiTable() { var resp = openils.Util.readResponse(r); self._updateProgressNumbers(resp); if(resp.complete) - location.href = oilsBasePath + '/eg/acq/po/view/' + resp.purchase_order.id(); + location.href = oilsBasePath + '/acq/po/view/' + resp.purchase_order.id(); } } ); @@ -2092,7 +2092,7 @@ function AcqLiTable() { function(id) { self._updateLiList(id, selected, 0, function(){ - location.href = oilsBasePath + '/eg/acq/picklist/view/' + id; + location.href = oilsBasePath + '/acq/picklist/view/' + id; }); } ); @@ -2100,7 +2100,7 @@ function AcqLiTable() { // update lineitems to use an existing picklist self._updateLiList(values.existing_pl, selected, 0, function(){ - location.href = oilsBasePath + '/eg/acq/picklist/view/' + values.existing_pl; + location.href = oilsBasePath + '/acq/picklist/view/' + values.existing_pl; }); } } 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 856e9e41f0..62a7145a66 100644 --- a/Open-ILS/web/js/ui/default/acq/picklist/upload.js +++ b/Open-ILS/web/js/ui/default/acq/picklist/upload.js @@ -109,13 +109,13 @@ function acqHandlePostUpload(key) { if(resp.picklist) { openils.Util.show('acq-pl-upload-complete-pl'); dojo.byId('acq-pl-upload-complete-pl').setAttribute( - 'href', oilsBasePath + '/eg/acq/picklist/view/' + resp.picklist.id()); + 'href', oilsBasePath + '/acq/picklist/view/' + resp.picklist.id()); } if(resp.purchase_order) { openils.Util.show('acq-pl-upload-complete-po'); dojo.byId('acq-pl-upload-complete-po').setAttribute( - 'href', oilsBasePath + '/eg/acq/po/view/' + resp.purchase_order.id()); + 'href', oilsBasePath + '/acq/po/view/' + resp.purchase_order.id()); } } else { diff --git a/Open-ILS/web/js/ui/default/acq/po/events.js b/Open-ILS/web/js/ui/default/acq/po/events.js index 047adabc7e..aaddfc55ae 100644 --- a/Open-ILS/web/js/ui/default/acq/po/events.js +++ b/Open-ILS/web/js/ui/default/acq/po/events.js @@ -222,7 +222,7 @@ function buildEventGrid() { function format_po_link(value) { if (value) { // FIXME -- how do you escape the value from .name() ? - return '' + po_map[ value ].name() + ''; + return '' + po_map[ value ].name() + ''; } } diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js index b373a941ae..cdfff5218e 100644 --- a/Open-ILS/web/js/ui/default/acq/po/view_po.js +++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js @@ -190,7 +190,7 @@ function cancellationUpdater(r) { function makeProviderLink(node, provider) { return dojo.create( "a", { - "href": "/eg/conify/global/acq/provider/" + provider.id(), + "href": oilsBasePath + "/conify/global/acq/provider/" + provider.id(), "innerHTML": provider.name() + " (" + provider.code() + ")", }, node, @@ -474,7 +474,7 @@ function splitPo() { oncomplete : function() { progressDialog.hide(); if (list) { - location.href = oilsBasePath + '/eg/acq/po/search/' + + location.href = oilsBasePath + '/acq/po/search/' + list.join(","); } } diff --git a/Open-ILS/web/js/ui/default/conify/global/action/survey.js b/Open-ILS/web/js/ui/default/conify/global/action/survey.js index c9809653d4..4e2b25c944 100644 --- a/Open-ILS/web/js/ui/default/conify/global/action/survey.js +++ b/Open-ILS/web/js/ui/default/conify/global/action/survey.js @@ -151,7 +151,7 @@ function svCreate(args) { svGrid.store.newItem(asv.toStoreItem(obj)); svSurveyDialog.hide(); svId = obj.id(); - document.location.href = "/eg/conify/global/action/survey/edit/"+svId; + document.location.href = oilsBasePath + "/conify/global/action/survey/edit/"+svId; } } ); diff --git a/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js b/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js index 7f3dbc6bc5..5dc659d688 100644 --- a/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js +++ b/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js @@ -49,7 +49,7 @@ function drawSurvey(svyId) { } function cancelEdit(){ - document.location.href = "/eg/conify/global/action/survey"; + document.location.href = oilsBasePath + "/conify/global/action/survey"; } function endSurvey(svyId) {