[open-ils-commits] r16222 - in trunk/Open-ILS/web/js/ui/default: acq/common acq/picklist acq/po conify/global/action conify/global/action/survey (erickson)
svn at svn.open-ils.org
svn at svn.open-ils.org
Tue Apr 13 09:59:31 EDT 2010
Author: erickson
Date: 2010-04-13 09:59:29 -0400 (Tue, 13 Apr 2010)
New Revision: 16222
Modified:
trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
trunk/Open-ILS/web/js/ui/default/acq/picklist/upload.js
trunk/Open-ILS/web/js/ui/default/acq/po/events.js
trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js
trunk/Open-ILS/web/js/ui/default/conify/global/action/survey.js
trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
Log:
use oilsBasePath consistently for relative url support
Modified: trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/acq/common/li_table.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -212,7 +212,7 @@
}
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 @@
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 @@
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(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 @@
// 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;
});
}
}
Modified: trunk/Open-ILS/web/js/ui/default/acq/picklist/upload.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/picklist/upload.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/acq/picklist/upload.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -109,13 +109,13 @@
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 {
Modified: trunk/Open-ILS/web/js/ui/default/acq/po/events.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/po/events.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/acq/po/events.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -222,7 +222,7 @@
function format_po_link(value) {
if (value) {
// FIXME -- how do you escape the value from .name() ?
- return '<a href="/eg/acq/po/view/' + value + '">' + po_map[ value ].name() + '</a>';
+ return '<a href="' + oilsBasePath + '/acq/po/view/' + value + '">' + po_map[ value ].name() + '</a>';
}
}
Modified: trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/acq/po/view_po.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -190,7 +190,7 @@
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 @@
oncomplete : function() {
progressDialog.hide();
if (list) {
- location.href = oilsBasePath + '/eg/acq/po/search/' +
+ location.href = oilsBasePath + '/acq/po/search/' +
list.join(",");
}
}
Modified: trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/action/survey/edit.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -49,7 +49,7 @@
}
function cancelEdit(){
- document.location.href = "/eg/conify/global/action/survey";
+ document.location.href = oilsBasePath + "/conify/global/action/survey";
}
function endSurvey(svyId) {
Modified: trunk/Open-ILS/web/js/ui/default/conify/global/action/survey.js
===================================================================
--- trunk/Open-ILS/web/js/ui/default/conify/global/action/survey.js 2010-04-13 00:53:31 UTC (rev 16221)
+++ trunk/Open-ILS/web/js/ui/default/conify/global/action/survey.js 2010-04-13 13:59:29 UTC (rev 16222)
@@ -151,7 +151,7 @@
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;
}
}
);
More information about the open-ils-commits
mailing list