From 5dee5e9f5297da9c2e5f672c4ca740552417f27b Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 5 Jun 2009 14:11:31 +0000 Subject: [PATCH] created setting to enable the creation of pending addresses git-svn-id: svn://svn.open-ils.org/ILS/trunk@13324 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/web/opac/locale/en-US/lang.dtd | 2 ++ Open-ILS/web/opac/skin/default/js/myopac.js | 24 ++++++++++++++++++---- .../skin/default/xml/myopac/myopac_summary.xml | 5 +++-- .../server/admin/org_unit_settings.xhtml | 5 +++++ 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index bc2d4f7dc0..905d94b20d 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -1637,6 +1637,8 @@ + + diff --git a/Open-ILS/web/opac/skin/default/js/myopac.js b/Open-ILS/web/opac/skin/default/js/myopac.js index f3294d2c0a..b987f28468 100644 --- a/Open-ILS/web/opac/skin/default/js/myopac.js +++ b/Open-ILS/web/opac/skin/default/js/myopac.js @@ -7,6 +7,7 @@ var fleshedUser = null; var fleshedContainers = {}; var holdCache = {}; var holdStatusCache = {}; +var allowPendingAddr = false; function clearNodes( node, keepArray ) { @@ -17,13 +18,23 @@ function clearNodes( node, keepArray ) { } function myOPACInit() { - if(!(G.user && G.user.session)) initLogin(); - else myOPACChangePage( "summary" ); + + if(!(G.user && G.user.session)) { + initLogin(); + + } else { + + allowPendingAddr = fetchOrgSettingDefault(G.user.home_ou(), 'opac.allow_pending_address'); + if(allowPendingAddr) + unHideMe($('myopac_pending_addr_td')); + myOPACChangePage( "summary" ); + } $('myopac_holds_thaw_date_input').onkeyup = function(){holdsVerifyThawDateUI('myopac_holds_thaw_date_input'); } $('myopac_holds_thaw_date_input').onchange = function(){holdsVerifyThawDateUI('myopac_holds_thaw_date_input'); } + } function myopacReload() { @@ -838,6 +849,8 @@ function _myOPACSummaryShowUer(r) { var addrs = user.addresses(); for( var a in addrs ) { var addr = addrs[a]; + if(!allowPendingAddr && isTrue(addr.pending())) + continue; if(addr.replaces() != null) continue; var row = template.cloneNode(true); myOPACDrawAddr(row, addr, addrs); @@ -875,7 +888,11 @@ function myOPACDrawAddr(row, addr, addrs) { appendClear($n(row, 'myopac_addr_state'),text(addr.state())); appendClear($n(row, 'myopac_addr_country'),text(addr.country())); appendClear($n(row, 'myopac_addr_zip'),text(addr.post_code())); + + if(!allowPendingAddr) return; + $n(row, 'myopac_addr_edit_link').onclick = function(){myopacEditAddress(addr)}; + unHideMe($n(row, 'myopac_addr_edit_td')); /* if we have a replacement address, plop it into the table next to this addr */ var repl = grep(addrs, @@ -972,8 +989,7 @@ function myopacSaveAddress(row, addr, deleteMe) { fleshedUser.addresses(addrs); } } - - alert('done'); + alertId('myopac_addr_changes_saved'); } ); req.send(); diff --git a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml index de11076d02..0ff10f093d 100644 --- a/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml +++ b/Open-ILS/web/opac/skin/default/xml/myopac/myopac_summary.xml @@ -173,7 +173,7 @@ &myopac.summary.addresses; - &myopac.summary.addresses.pending; + &myopac.summary.addresses.pending; @@ -213,7 +213,7 @@ - + Edit Address @@ -280,6 +280,7 @@
&myopac.summary.password.success;
&myopac.summary.password.failure;
&myopac.summary.username.invalid; + Address Saved diff --git a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml index 50c57b70d4..f6411c76e5 100644 --- a/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml +++ b/Open-ILS/xul/staff_client/server/admin/org_unit_settings.xhtml @@ -184,6 +184,11 @@ label : '&staff.server.admin.org_settings.circ.lost_immediately_available;', desc : '&staff.server.admin.org_settings.circ.lost_immediately_available.desc;', type : 'bool' + }, + 'opac.allow_pending_address' : { + label : '&staff.server.admin.org_settings.opac.allow_pending_address;', + desc : '&staff.server.admin.org_settings.opac.allow_pending_address.desc;', + type : 'bool' } }; -- 2.11.0