[open-ils-commits] [GIT] Evergreen ILS branch master updated. cfc68f04ee84a461539ae7dcf1ee467fadff7eb5
Evergreen Git
git at git.evergreen-ils.org
Fri May 25 13:13:25 EDT 2012
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 cfc68f04ee84a461539ae7dcf1ee467fadff7eb5 (commit)
from a8c34b4547e92bd004fbfbad2734b125f5fc082c (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 cfc68f04ee84a461539ae7dcf1ee467fadff7eb5
Author: Jason Etheridge <jason at esilibrary.com>
Date: Tue Apr 10 15:35:31 2012 -0400
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 at esilibrary.com>
Signed-off-by: Michael Peters <mrpeters at library.in.gov>
Signed-off-by: Mike Rylander <mrylander at 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 8839740..8180820 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 86e08e1..f3c0222 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 5316bbf..836d2b3 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 921fdfa..9588022 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 bf4bdad..cad4e88 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 50f5b15..7954004 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); }
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/web/opac/locale/en-US/lang.dtd | 2 ++
.../xul/staff_client/chrome/content/main/menu.js | 17 +++++++++++++++++
.../chrome/content/main/menu_frame_menus.xul | 2 ++
.../chrome/content/main/menu_frame_overlay.xul | 5 +++++
Open-ILS/xul/staff_client/server/patron/holds.js | 10 +++++++++-
Open-ILS/xul/staff_client/server/patron/holds.xul | 1 +
6 files changed, 36 insertions(+), 1 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list