From: phasefx <phasefx@dcc99617-32d9-48b4-a31d-7c20da2025e4> Date: Tue, 27 Oct 2009 06:45:58 +0000 (+0000) Subject: wire up un-cancel hold action in the staff client X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=b92f045c5ec8b75073c6356eccf1cd9b60e1a427;p=evergreen%2Ftadl.git wire up un-cancel hold action in the staff client git-svn-id: svn://svn.open-ils.org/ILS/trunk@14624 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd index 74ac00c121..3cb462e198 100644 --- a/Open-ILS/web/opac/locale/en-US/lang.dtd +++ b/Open-ILS/web/opac/locale/en-US/lang.dtd @@ -2056,6 +2056,8 @@ <!ENTITY staff.circ.holds.retarget.accesskey "T"> <!ENTITY staff.circ.holds.cancel "Cancel Hold"> <!ENTITY staff.circ.holds.cancel.accesskey "C"> +<!ENTITY staff.circ.holds.uncancel "Un-cancel Hold"> +<!ENTITY staff.circ.holds.uncancel.accesskey "U"> <!ENTITY staff.circ.holds.save_columns "Save Columns"> <!ENTITY staff.circ.holds.save_columns.accesskey ""> <!ENTITY staff.hold_list.cancel_hold_dialog.title "Cancel Hold"> diff --git a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties index 2dc4f2d40c..e58ca1f3a1 100644 --- a/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties +++ b/Open-ILS/xul/staff_client/server/locale/en-US/patron.properties @@ -171,6 +171,7 @@ staff.patron.holds.holds_cancel.cancel_for_barcodes=For barcodes %1$s, should th staff.patron.holds.holds_cancel.cancel_for_barcodes.title=Cancelling Transits staff.patron.holds.holds_cancel.hold_transits_not_cancelled=Hold transits not likely cancelled. staff.patron.holds.holds_cancel.hold_not_cancelled=Holds not likely cancelled. +staff.patron.holds.holds_uncancel.hold_not_uncancelled=Holds not likely un-cancelled. staff.patron.holds.show_catalog.unknown_htype=I do not understand the hold type of %1$s so I can not display the appropriate record in the catalog. staff.patron.holds.show_catalog.retrieving_title=Retrieving title... staff.patron.holds.lib_menus.missing_library_list=Missing library list. diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js index 50e829bf18..828f4857b7 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds.js +++ b/Open-ILS/xul/staff_client/server/patron/holds.js @@ -146,6 +146,7 @@ patron.holds.prototype = { obj.controller.view.cmd_alt_view.setAttribute('disabled','false'); obj.controller.view.cmd_holds_retarget.setAttribute('disabled','false'); obj.controller.view.cmd_holds_cancel.setAttribute('disabled','false'); + obj.controller.view.cmd_holds_uncancel.setAttribute('disabled','false'); obj.controller.view.cmd_show_catalog.setAttribute('disabled','false'); } else { obj.controller.view.sel_mark_items_damaged.setAttribute('disabled','true'); @@ -164,6 +165,7 @@ patron.holds.prototype = { obj.controller.view.cmd_alt_view.setAttribute('disabled','true'); obj.controller.view.cmd_holds_retarget.setAttribute('disabled','true'); obj.controller.view.cmd_holds_cancel.setAttribute('disabled','true'); + obj.controller.view.cmd_holds_uncancel.setAttribute('disabled','true'); obj.controller.view.cmd_show_catalog.setAttribute('disabled','true'); } } @@ -815,6 +817,22 @@ patron.holds.prototype = { } } ], + 'cmd_holds_uncancel' : [ + ['command'], + function() { + try { + JSAN.use('util.functional'); + for (var i = 0; i < obj.retrieve_ids.length; i++) { + var robj = obj.network.simple_request('FM_AHR_UNCANCEL',[ ses(), obj.retrieve_ids[i].id]); + if (typeof robj.ilsevent != 'undefined') throw(robj); + } + obj.clear_and_retrieve(); + } catch(E) { + obj.error.standard_unexpected_error_alert($("patronStrings").getString('staff.patron.holds.holds_uncancel.hold_not_uncancelled'),E); + } + } + ], + 'cmd_retrieve_patron' : [ ['command'], function() { diff --git a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul index 6a1f201c46..e462425a80 100644 --- a/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul +++ b/Open-ILS/xul/staff_client/server/patron/holds_overlay.xul @@ -31,6 +31,7 @@ <command id="cmd_broken" disabled="true" hidden="true"/> <command id="cmd_holds_retarget"/> <command id="cmd_holds_cancel" /> + <command id="cmd_holds_uncancel" /> <command id="cmd_search_opac" /> <command id="save_columns" /> <command id="cmd_alt_view" /> @@ -59,6 +60,7 @@ <menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/> <menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/> <menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/> + <menuitem label="&staff.circ.holds.uncancel;" command="cmd_holds_uncancel" accesskey="&staff.circ.holds.uncancel.accesskey;"/> <menuseparator /> <menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/> </popup> @@ -127,6 +129,7 @@ <menuitem command="sel_mark_items_missing" label="&staff.circ.holds.mark_item_missing;" accesskey="&staff.circ.holds.mark_item_missing.accesskey;"/> <menuitem label="&staff.circ.holds.retarget;" command="cmd_holds_retarget" accesskey="&staff.circ.holds.retarget.accesskey;"/> <menuitem label="&staff.circ.holds.cancel;" command="cmd_holds_cancel" accesskey="&staff.circ.holds.cancel.accesskey;"/> + <menuitem label="&staff.circ.holds.uncancel;" command="cmd_holds_uncancel" accesskey="&staff.circ.holds.uncancel.accesskey;"/> <menuseparator /> <menuitem command="save_columns" label="&staff.circ.holds.save_columns;" accesskey="&staff.circ.holds.save_columns.accesskey;"/> </menupopup>