[open-ils-commits] [GIT] Evergreen ILS branch master updated. 93d5b4e7ddf2e4f70f29ee495e3d499696c2dcea
Evergreen Git
git at git.evergreen-ils.org
Wed Jul 27 15:28:34 EDT 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 93d5b4e7ddf2e4f70f29ee495e3d499696c2dcea (commit)
from 0142b2b677359f217cdc773aac9f4888f6a136ea (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 93d5b4e7ddf2e4f70f29ee495e3d499696c2dcea
Author: Jason Etheridge <jason at esilibrary.com>
Date: Tue Jul 26 17:37:57 2011 -0400
move query params into the constants to better support current opac and TT-opac
Signed-off-by: Jason Etheridge <jason at esilibrary.com>
Signed-off-by: Bill Erickson <berick at esilibrary.com>
diff --git a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
index e56226a..f64883e 100644
--- a/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
+++ b/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
@@ -1001,7 +1001,7 @@ function gen_statusbar_click_handler(data_key) {
}
if (ev.button == 0 /* left click, spawn opac */) {
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + g.data[data_key];
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + g.data[data_key];
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/constants.js b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
index 57c631c..9413809 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/constants.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/constants.js
@@ -369,8 +369,9 @@ var api = {
var urls = {
'opac' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
- 'opac_rdetail' : '/opac/' + LOCALE + '/skin/default/xml/rdetail.xml',
+ 'opac_rdetail' : '/opac/' + LOCALE + '/skin/default/xml/rdetail.xml?r=',
'opac_rresult' : '/opac/' + LOCALE + '/skin/default/xml/rresult.xml',
+ 'opac_rresult_metarecord' : '/opac/' + LOCALE + '/skin/default/xml/rresult.xml?m=',
'org_tree' : '/opac/common/js/' + LOCALE + '/OrgTree.js',
'browser' : '/opac/' + LOCALE + '/skin/default/xml/advanced.xml?nps=1',
'fieldmapper' : '/opac/common/js/fmall.js',
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu.js b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
index 8921eb6..de4579f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -394,7 +394,7 @@ main.menu.prototype = {
function spawn_tcn(r,event) {
for (var i = 0; i < r.count; i++) {
var id = r.ids[i];
- var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + id;
+ var opac_url = obj.url_prefix( urls.opac_rdetail ) + id;
obj.data.stash_retrieve();
var content_params = {
'session' : ses(),
@@ -444,7 +444,7 @@ main.menu.prototype = {
var bib_id = prompt(offlineStrings.getString('menu.cmd_search_bib_id.tab'),'',offlineStrings.getString('menu.cmd_search_bib_id.prompt'));
if (!bib_id) return;
- var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + bib_id;
+ var opac_url = obj.url_prefix( urls.opac_rdetail ) + bib_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
@@ -1133,7 +1133,7 @@ main.menu.prototype = {
alert(offlineStrings.getString('menu.cmd_retrieve_last_record.session.error'));
return;
}
- var opac_url = obj.url_prefix( urls.opac_rdetail ) + '?r=' + obj.data.last_record;
+ var opac_url = obj.url_prefix( urls.opac_rdetail ) + obj.data.last_record;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/bibs_abreast.js b/Open-ILS/xul/staff_client/server/cat/bibs_abreast.js
index 3b3d088..81efb52 100644
--- a/Open-ILS/xul/staff_client/server/cat/bibs_abreast.js
+++ b/Open-ILS/xul/staff_client/server/cat/bibs_abreast.js
@@ -192,7 +192,7 @@ function merge_records() {
if (typeof xulG.on_merge == 'function') {
xulG.on_merge(robj);
}
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + lead_record;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + lead_record;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/marc_new.xul b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
index 7debf35..633d047 100644
--- a/Open-ILS/xul/staff_client/server/cat/marc_new.xul
+++ b/Open-ILS/xul/staff_client/server/cat/marc_new.xul
@@ -111,7 +111,7 @@
/* Replace tab with OPAC-view of record */
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + robj.id();
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + robj.id();
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/record_buckets.js b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
index b0d0f88..e4a0038 100644
--- a/Open-ILS/xul/staff_client/server/cat/record_buckets.js
+++ b/Open-ILS/xul/staff_client/server/cat/record_buckets.js
@@ -781,7 +781,7 @@ cat.record_buckets.prototype = {
for (var i = 0; i < docids.length; i++) {
var doc_id = docids[i];
if (seen[doc_id]) continue; seen[doc_id] = true;
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + doc_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/util.js b/Open-ILS/xul/staff_client/server/cat/util.js
index 600f360..98a6dd4 100644
--- a/Open-ILS/xul/staff_client/server/cat/util.js
+++ b/Open-ILS/xul/staff_client/server/cat/util.js
@@ -257,7 +257,7 @@ cat.util.show_in_opac = function(selection_list) {
continue;
}
seen[doc_id] = true;
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + doc_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
@@ -1163,7 +1163,7 @@ cat.util.mark_for_overlay = function(doc_id,doc_mvr) {
if (ev.button == 0 /* left click, spawn opac */) {
var opac_url = xulG.url_prefix( urls.opac_rdetail )
- + '?r=' + data[data_key];
+ + data[data_key];
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
index 5e204c4..5246e9c 100644
--- a/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
+++ b/Open-ILS/xul/staff_client/server/cat/volume_copy_creator.js
@@ -1175,7 +1175,7 @@ g.stash_and_close = function(param) {
}
if (xul_param('load_opac_when_done')) {
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + g.doc_id;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + g.doc_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index 2a8fd84..ac3e712 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -741,7 +741,7 @@ cat.z3950.prototype = {
},
'replace_tab_with_opac' : function(doc_id) {
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + doc_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
diff --git a/Open-ILS/xul/staff_client/server/index.xhtml b/Open-ILS/xul/staff_client/server/index.xhtml
index 44b6c81..cfb5439 100644
--- a/Open-ILS/xul/staff_client/server/index.xhtml
+++ b/Open-ILS/xul/staff_client/server/index.xhtml
@@ -42,6 +42,9 @@
if(textbox && textbox.value != "") {
var opac_url = xulG.url_prefix(urls.opac_rresult) + "?rt=keyword&tp=keyword&l=" + home_ou_id + "&d=" + search_depth +"&f=&t=" + escape(textbox.value);
+ if (urls.opac_rresult.match(/\/eg\/opac\/results/)) {
+ opac_url = xulG.url_prefix(urls.opac_rresult) + "?query=" + escape(textbox.value);
+ }
var params = {'tab_name':'Catalog'};
var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'opac_url' : opac_url };
xulG.set_tab(urls.XUL_OPAC_WRAPPER, params, content_params);
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index a1c5b83..cbe2ba1 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -1147,19 +1147,19 @@ patron.holds.prototype = {
var opac_url;
switch(htype) {
case 'M' :
- opac_url = xulG.url_prefix( urls.opac_rresult ) + '?m=' + htarget;
+ opac_url = xulG.url_prefix( urls.opac_rresult_metarecord ) + htarget;
break;
case 'T' :
case 'P' :
- opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + htarget;
+ opac_url = xulG.url_prefix( urls.opac_rdetail ) + htarget;
break;
case 'I' :
opac_url = xulG.url_prefix( urls.opac_rdetail )
- + '?r=' + obj.hold_subscription_map[ obj.retrieve_ids[i].id ].record_entry();
+ + obj.hold_subscription_map[ obj.retrieve_ids[i].id ].record_entry();
break;
case 'V' :
var my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative', [ htarget ]);
- opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
+ opac_url = xulG.url_prefix( urls.opac_rdetail) + my_acn.record();
break;
case 'C' :
case 'R' :
@@ -1172,7 +1172,7 @@ patron.holds.prototype = {
my_acn = obj.network.simple_request( 'FM_ACN_RETRIEVE.authoritative',
[ my_acp.call_number() ]);
}
- opac_url = xulG.url_prefix( urls.opac_rdetail) + '?r=' + my_acn.record();
+ opac_url = xulG.url_prefix( urls.opac_rdetail) + my_acn.record();
break;
default:
obj.error.standard_unexpected_error_alert($("patronStrings").getFormattedString('staff.patron.holds.show_catalog.unknown_htype', [htype]), obj.retrieve_ids[i]);
diff --git a/Open-ILS/xul/staff_client/server/patron/items.js b/Open-ILS/xul/staff_client/server/patron/items.js
index 63c1d1c..379b35d 100644
--- a/Open-ILS/xul/staff_client/server/patron/items.js
+++ b/Open-ILS/xul/staff_client/server/patron/items.js
@@ -589,7 +589,7 @@ patron.items.prototype = {
alert($("patronStrings").getFormattedString('staff.patron.items.show_catalog.barcode_not_cataloged', [retrieve_ids[i].barcode]));
continue;
}
- var opac_url = xulG.url_prefix( urls.opac_rdetail ) + '?r=' + doc_id;
+ var opac_url = xulG.url_prefix( urls.opac_rdetail ) + doc_id;
var content_params = {
'session' : ses(),
'authtime' : ses('authtime'),
-----------------------------------------------------------------------
Summary of changes:
.../xul/staff_client/chrome/content/cat/opac.js | 2 +-
.../staff_client/chrome/content/main/constants.js | 3 ++-
.../xul/staff_client/chrome/content/main/menu.js | 6 +++---
.../xul/staff_client/server/cat/bibs_abreast.js | 2 +-
Open-ILS/xul/staff_client/server/cat/marc_new.xul | 2 +-
.../xul/staff_client/server/cat/record_buckets.js | 2 +-
Open-ILS/xul/staff_client/server/cat/util.js | 4 ++--
.../staff_client/server/cat/volume_copy_creator.js | 2 +-
Open-ILS/xul/staff_client/server/cat/z3950.js | 2 +-
Open-ILS/xul/staff_client/server/index.xhtml | 3 +++
Open-ILS/xul/staff_client/server/patron/holds.js | 10 +++++-----
Open-ILS/xul/staff_client/server/patron/items.js | 2 +-
12 files changed, 22 insertions(+), 18 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list