[open-ils-commits] r12276 - in trunk/Open-ILS/xul/staff_client: chrome/content/main server/patron (phasefx)
svn at svn.open-ils.org
svn at svn.open-ils.org
Mon Feb 23 17:56:53 EST 2009
Author: phasefx
Date: 2009-02-23 17:56:49 -0500 (Mon, 23 Feb 2009)
New Revision: 12276
Modified:
trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
trunk/Open-ILS/xul/staff_client/server/patron/display.js
trunk/Open-ILS/xul/staff_client/server/patron/holds.js
trunk/Open-ILS/xul/staff_client/server/patron/holds.xul
Log:
pass the patron barcode into the opac when embedded in the patron display, and use the remote xul opac wrapper for now to get around a security bump
Modified: trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-02-23 22:26:50 UTC (rev 12275)
+++ trunk/Open-ILS/xul/staff_client/chrome/content/main/constants.js 2009-02-23 22:56:49 UTC (rev 12276)
@@ -285,7 +285,7 @@
'XUL_OFFLINE_MANAGE_XACTS' : '/xul/server/admin/offline_manage_xacts.xul',
'XUL_OFFLINE_MANAGE_XACTS_CGI' : '/cgi-bin/offline/offline.pl',
'XUL_OFFLINE_GENERATE_WIDGETS' : '/xul/server/main/gen_offline_widgets.xul',
- /* 'XUL_OPAC_WRAPPER' : '/xul/server/cat/opac.xul', */
+ 'XUL_REMOTE_OPAC_WRAPPER' : '/xul/server/cat/opac.xul',
'XUL_OPAC_WRAPPER' : 'chrome://open_ils_staff_client/content/cat/opac.xul',
'XUL_PATRON_BARCODE_ENTRY' : '/xul/server/patron/barcode_entry.xul',
'XUL_PATRON_BILLS' : '/xul/server/patron/bills.xul',
Modified: trunk/Open-ILS/xul/staff_client/server/patron/display.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/display.js 2009-02-23 22:26:50 UTC (rev 12275)
+++ trunk/Open-ILS/xul/staff_client/server/patron/display.js 2009-02-23 22:56:49 UTC (rev 12276)
@@ -307,25 +307,30 @@
'cmd_patron_holds' : [
['command'],
function(ev) {
- try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_holds" ) ); } catch(E) {};
- obj.reset_nav_styling('cmd_patron_holds');
- obj.right_deck.set_iframe(
- urls.XUL_PATRON_HOLDS,
- //+ '?patron_id=' + window.escape( obj.patron.id() ),
- {},
- {
- 'display_window' : window,
- 'patron_id' : obj.patron.id(),
- 'on_list_change' : function(h) {
- netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
- //obj.summary_window.g.summary.controller.render('patron_holds');
- //obj.summary_window.g.summary.controller.render('patron_standing_penalties');
- obj.refresh_all();
- },
- 'url_prefix' : xulG.url_prefix,
- 'new_tab' : xulG.new_tab
- }
- );
+ try {
+ try { document.getElementById("PatronNavBarScrollbox").ensureElementIsVisible( document.getElementById("PatronNavBar_holds" ) ); } catch(E) {};
+ obj.reset_nav_styling('cmd_patron_holds');
+ obj.right_deck.set_iframe(
+ urls.XUL_PATRON_HOLDS,
+ //+ '?patron_id=' + window.escape( obj.patron.id() ),
+ {},
+ {
+ 'display_window' : window,
+ 'patron_id' : obj.patron.id(),
+ 'patron_barcode' : obj.patron.card().barcode(),
+ 'on_list_change' : function(h) {
+ netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+ //obj.summary_window.g.summary.controller.render('patron_holds');
+ //obj.summary_window.g.summary.controller.render('patron_standing_penalties');
+ obj.refresh_all();
+ },
+ 'url_prefix' : xulG.url_prefix,
+ 'new_tab' : xulG.new_tab
+ }
+ );
+ } catch(E) {
+ alert(E);
+ }
}
],
'cmd_patron_bills' : [
Modified: trunk/Open-ILS/xul/staff_client/server/patron/holds.js
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/holds.js 2009-02-23 22:26:50 UTC (rev 12275)
+++ trunk/Open-ILS/xul/staff_client/server/patron/holds.js 2009-02-23 22:56:49 UTC (rev 12276)
@@ -35,6 +35,7 @@
var obj = this;
obj.patron_id = params['patron_id'];
+ obj.patron_barcode = params['patron_barcode'];
obj.docid = params['docid'];
obj.shelf = params['shelf'];
obj.tree_id = params['tree_id'];
@@ -905,7 +906,7 @@
'cmd_search_opac' : [
['command'],
function(ev) {
- var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'patron_id' : obj.patron_id };
+ var content_params = { 'session' : ses(), 'authtime' : ses('authtime'), 'patron_barcode' : obj.patron_barcode };
content_params.new_tab = xulG.new_tab;
content_params.set_tab = xulG.set_tab;
content_params.set_tab_name = xulG.set_tab_name;
@@ -913,7 +914,7 @@
content_params.url_prefix = xulG.url_prefix;
content_params.network_meter = xulG.network_meter;
content_params.chrome_xulG = xulG.chrome_xulG;
- xulG.display_window.g.patron.right_deck.set_iframe( urls.XUL_OPAC_WRAPPER, {}, content_params);
+ xulG.display_window.g.patron.right_deck.set_iframe( urls.XUL_REMOTE_OPAC_WRAPPER, {}, content_params);
}
]
}
Modified: trunk/Open-ILS/xul/staff_client/server/patron/holds.xul
===================================================================
--- trunk/Open-ILS/xul/staff_client/server/patron/holds.xul 2009-02-23 22:26:50 UTC (rev 12275)
+++ trunk/Open-ILS/xul/staff_client/server/patron/holds.xul 2009-02-23 22:56:49 UTC (rev 12276)
@@ -49,6 +49,7 @@
g.holds.init(
{
'patron_id' : xul_param('patron_id'),
+ 'patron_barcode' : xul_param('patron_barcode'),
'docid' : xul_param('docid'),
'shelf' : xul_param('shelf'),
'pull' : xul_param('pull'),
More information about the open-ils-commits
mailing list