From 3944a432c6475a3d5252d27e4387276d2c2f969b Mon Sep 17 00:00:00 2001
From: Jason Etheridge <jason@esilibrary.com>
Date: Tue, 5 Apr 2011 19:30:55 -0400
Subject: [PATCH] move from action buttons to the standard Actions menu and
 provide right-click context menu on the list.  Don't apply actions to
 selected error rows

---
 .../server/cat/manage_multi_home_items.js          | 10 +++++----
 .../server/cat/manage_multi_home_items.xul         | 26 ++++++++++++++++++----
 2 files changed, 28 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js
index 0ff25bf111..79ab906c9c 100644
--- a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js
+++ b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.js
@@ -285,8 +285,9 @@ function handle_change() {
         var node_list = list.retrieve_selection();
         var eligibles = [];
         for (var i = 0; i < node_list.length; i++) {
-            if (node_list[i].hasAttribute('retrieve_id')) {
-                eligibles.push( node_list[i].getAttribute('retrieve_id') );
+            var retrieve_id = node_list[i].getAttribute('retrieve_id');
+            if (retrieve_id && retrieve_id != 'undefined') {
+                eligibles.push( retrieve_id );
             }
         }
         if (eligibles.length > 0) {
@@ -339,8 +340,9 @@ function handle_remove() {
         var node_list = list.retrieve_selection();
         var eligibles = [];
         for (var i = 0; i < node_list.length; i++) {
-            if (node_list[i].hasAttribute('retrieve_id')) {
-                eligibles.push( node_list[i].getAttribute('retrieve_id') );
+            var retrieve_id = node_list[i].getAttribute('retrieve_id');
+            if (retrieve_id && retrieve_id != 'undefined') {
+                eligibles.push( retrieve_id );
             }
         }
         if (eligibles.length > 0) {
diff --git a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
index 5bb0c3d6ab..a500b9a202 100644
--- a/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
+++ b/Open-ILS/xul/staff_client/server/cat/manage_multi_home_items.xul
@@ -31,18 +31,36 @@
     <script type="text/javascript" src="/xul/server/main/JSAN.js"/>
     <script type="text/javascript" src="manage_multi_home_items.js"/>
 
+    <commandset>
+        <command id="change" label="Change Peer Type on Selected Items" accesskey="C"/>
+        <command id="remove" label="Remove Selected Items from Bib" accesskey="R"/>
+    </commandset>
+
+    <popupset>
+        <popup id="actions">
+            <menuitem command="change" />
+            <menuitem command="remove" />
+        </popup>
+    </popupset>
+
     <vbox flex="1" class="my_overflow">
         <hbox>
-            <label value="Peer Type:" />
+            <label value="Peer Type:" accesskey="T" control="bpt_menu"/>
             <hbox id="menu_placeholder" />
             <label control="scanbox" value="Barcode:" accesskey="B"/>
             <textbox id="scanbox"/>
             <button id="submit" label="Add to Bib" accesskey="A"/>
             <spacer flex="1"/>
-            <button id="change" label="Change Peer Type on Selected Items"/> 
-            <button id="remove" label="Remove Selected Items from Bib"/> 
+            <menubar>
+                <menu label="Actions for Selected Items" accesskey="f">
+                    <menupopup>
+                        <menuitem command="change" />
+                        <menuitem command="remove" />
+                    </menupopup>
+                </menu>
+            </menubar>
         </hbox>
-        <tree id="list" flex="1" enableColumnDrag="true" />
+        <tree id="list" flex="1" enableColumnDrag="true" context="actions"/>
         <hbox id="list_actions" />
     </vbox>
 
-- 
2.11.0