From: Jason Etheridge <jason@esilibrary.com>
Date: Tue, 10 Apr 2012 19:35:31 +0000 (-0400)
Subject: menu entry Circulation->Clear Shelf-Expired Holds
X-Git-Tag: sprint4-merge-nov22~4189
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=cfc68f04ee84a461539ae7dcf1ee467fadff7eb5;p=working%2FEvergreen.git

menu entry Circulation->Clear Shelf-Expired Holds

This spawns the Browse Hold Shelf interface but automatically triggers the View
Shelf-Expired Holds and Clear these Holds options.

Signed-off-by: Jason Etheridge <jason@esilibrary.com>
Signed-off-by: Michael Peters <mrpeters@library.in.gov>
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/web/opac/locale/en-US/lang.dtd b/Open-ILS/web/opac/locale/en-US/lang.dtd
index 8839740103..8180820806 100644
--- a/Open-ILS/web/opac/locale/en-US/lang.dtd
+++ b/Open-ILS/web/opac/locale/en-US/lang.dtd
@@ -1017,6 +1017,8 @@
 <!ENTITY staff.main.menu.circ.found.label "Mark Found">
 <!ENTITY staff.main.menu.circ.hold_browse.accesskey "B">
 <!ENTITY staff.main.menu.circ.hold_browse.label "Browse Holds Shelf">
+<!ENTITY staff.main.menu.circ.hold_clear.accesskey "">
+<!ENTITY staff.main.menu.circ.hold_clear.label "Clear Shelf-Expired Holds">
 <!ENTITY staff.main.menu.circ.hold_capture.accesskey "H">
 <!ENTITY staff.main.menu.circ.hold_capture.label "Capture Holds">
 <!ENTITY staff.main.menu.circ.hold_pull.accesskey "S">
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 86e08e104b..f3c02228d1 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu.js
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu.js
@@ -567,6 +567,23 @@ main.menu.prototype = {
                     obj.command_tab(event,obj.url_prefix(urls.XUL_HOLDS_BROWSER)+'?shelf=1',{ 'tab_name' : offlineStrings.getString('menu.cmd_browse_holds_shelf.tab') },{});
                 }
             ],
+            'cmd_clear_holds_shelf' : [
+                ['oncommand'],
+                function(event) {
+                    obj.data.stash_retrieve();
+                    obj.command_tab(
+                        event,
+                        obj.url_prefix(urls.XUL_HOLDS_BROWSER),
+                        {
+                            'tab_name' : offlineStrings.getString('menu.cmd_browse_holds_shelf.tab')
+                        },
+                        {
+                            'shelf':1,
+                            'clear':true
+                        }
+                    );
+                }
+            ],
             'cmd_circ_hold_pull_list' : [
                 ['oncommand'],
                 function(event) { 
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
index 5316bbf715..836d2b3344 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_menus.xul
@@ -32,6 +32,7 @@
     <command id="cmd_circ_hold_pull_list" />
     <command id="cmd_browse_holds" />
     <command id="cmd_browse_holds_shelf" />
+    <command id="cmd_clear_holds_shelf" />
     <command id="cmd_in_house_use" />
     <command id="cmd_scan_item_as_missing_pieces" />
     <command id="cmd_copy_status" />
@@ -325,6 +326,7 @@
         <menuitem label="&staff.main.menu.circ.hold_capture.label;" accesskey="&staff.main.menu.circ.hold_capture.accesskey;" command="cmd_circ_hold_capture"/>
         <menuitem label="&staff.main.menu.circ.hold_pull.label;" accesskey="&staff.main.menu.circ.hold_pull.accesskey;" command="cmd_circ_hold_pull_list"/>
         <menuitem label="&staff.main.menu.circ.hold_browse.label;" command="cmd_browse_holds_shelf" accesskey="&staff.main.menu.circ.hold_browse.accesskey;"/>
+        <menuitem label="&staff.main.menu.circ.hold_clear.label;" command="cmd_clear_holds_shelf" accesskey="&staff.main.menu.circ.hold_clear.accesskey;"/>
         <menuitem label="&staff.main.menu.circ.place_hold.label;" accesskey="&staff.main.menu.circ.place_hold.accesskey;" command="cmd_search_opac"/>
         <menuseparator />
         <menuitem label="&staff.main.menu.circ.barcode.show_item;" accesskey="&staff.main.menu.circ.barcode.show_item.accesskey;" command="cmd_copy_status"/>
diff --git a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
index 921fdfa2c3..9588022d93 100644
--- a/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/chrome/content/main/menu_frame_overlay.xul
@@ -182,6 +182,11 @@
         command="cmd_browse_holds_shelf"
         templateid="browse_holds_shelf" />
     <toolbarbutton
+        label="&staff.main.menu.circ.hold_clear.label;"
+        tooltiptext="&staff.main.menu.circ.hold_clear.label;"
+        command="cmd_clear_holds_shelf"
+        templateid="clear_holds_shelf" />
+    <toolbarbutton
         label="&staff.main.menu.circ.patron_retrieve.label;"
         tooltiptext="&staff.main.menu.circ.patron_retrieve.label;"
         command="cmd_retrieve_last_patron"
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.js b/Open-ILS/xul/staff_client/server/patron/holds.js
index bf4bdad7db..cad4e88dcb 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.js
+++ b/Open-ILS/xul/staff_client/server/patron/holds.js
@@ -1570,7 +1570,15 @@ patron.holds.prototype = {
                     if (obj.controller.view.lib_menu) obj.controller.view.lib_menu.disabled = true;
                 }
                 obj.controller.render();
-                obj.retrieve(true);
+                if (params['clear']) {
+                    JSAN.use('util.widgets');
+                    var x = document.getElementById('expired_checkbox');
+                    x.checked = true;
+                    obj.expired = true;
+                    util.widgets.dispatch('command','cmd_clear_expired_onshelf_holds');
+                } else {
+                    obj.retrieve(true);
+                }
 
                 obj.controller.view.cmd_retrieve_patron.setAttribute('disabled','true');
                 obj.controller.view.cmd_holds_edit_pickup_lib.setAttribute('disabled','true');
diff --git a/Open-ILS/xul/staff_client/server/patron/holds.xul b/Open-ILS/xul/staff_client/server/patron/holds.xul
index 50f5b15935..795400404a 100644
--- a/Open-ILS/xul/staff_client/server/patron/holds.xul
+++ b/Open-ILS/xul/staff_client/server/patron/holds.xul
@@ -52,6 +52,7 @@
                         'docid' : xul_param('docid'),
                         'shelf' : xul_param('shelf'),
                         'pull' : xul_param('pull'),
+                        'clear' : xul_param('clear')
                     } 
                 );
                 window.refresh = function(p) { g.holds.list.clear(); g.holds.retrieve(p); }