Acq - Show only context-appropriate options in actions dropdown menu

TODO: add_to_order, apply_claim_policy, receive_lineitems,
rollback_receive_lineitems

Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>

diff --git a/Open-ILS/src/templates/acq/common/li_table.tt2 b/Open-ILS/src/templates/acq/common/li_table.tt2
index c7da2d9..5e8efd0 100644 (file)
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -15,27 +15,37 @@
                                 <td>
                                     <span>
                                         <select id="acq-lit-li-actions-selector">
+                                    <!-- mask meanings:
+                                        pl: selection list
+                                        po: pending purchase order
+                                        ao: activated purchase order
+                                        gs: general search
+                                        vp: view/place orders
+                                        fs: MARC federated search
+
+                                        * for all, otherwise combine with |
+                                    -->
                                             <option mask='*'  value='_'>[% l('--Actions--') %]</option>
-                                            <option mask='sr' value='save_picklist'>[% l('Save Items To Selection List') %]</option>
-                                            <option mask='pl' value='selector_ready'>[% l('Mark Ready for Selector') %]</option>
-                                            <option mask='pl' value='order_ready'>[% l('Mark Ready for Order') %]</option>
-                                            <option mask='*'  value='delete_selected'>[% l('Delete Selected Items') %]</option>
-                                            <option mask='*'  value='add_brief_record'>[% l('Add Brief Record') %]</option>
-                                            <option mask='*'  value='export_attr_list'>[% l('Export Single Attribute List') %]</option>
-                                            <option mask='po' value='' disabled='disabled'>[% l('----PO----') %]</option>
-                                            <option mask='sr|pl' value='create_order'>[% l('Create Purchase Order') %]</option>
-                                            <option mask='sr|pl' value='add_to_order'>[% l('Add to Purchase Order') %]</option>
-                                            <option mask='po' value='print_po'>[% l('Print Purchase Order') %]</option>
-                                            <option mask='po' value='po_history'>[% l('View PO History') %]</option>
+                                            <option mask='pl|gs|vp|fs' value='save_picklist'>[% l('Save Items To Selection List') %]</option>
+                                            <option mask='pl|gs|vp' value='selector_ready'>[% l('Mark Ready for Selector') %]</option>
+                                            <option mask='pl|gs|vp' value='order_ready'>[% l('Mark Ready for Order') %]</option>
+                                            <option mask='pl|po|gs|vp'  value='delete_selected'>[% l('Delete Selected Items') %]</option>
+                                            <option mask='pl|po'  value='add_brief_record'>[% l('Add Brief Record') %]</option>
+                                            <option mask='pl|po|ao|gs'  value='export_attr_list'>[% l('Export Single Attribute List') %]</option>
+                                            <option mask='*' value='' disabled='disabled'>[% l('----PO----') %]</option>
+                                            <option mask='pl|gs|vp|fs' value='create_order'>[% l('Create Purchase Order') %]</option>
+                                            <option mask='pl|gs|vp|fs' value='add_to_order'>[% l('Add to Purchase Order') %]</option>
+                                            <option mask='po|ao' value='print_po'>[% l('Print Purchase Order') %]</option>
+                                            <option mask='po|ao' value='po_history'>[% l('View PO History') %]</option>
                                             <option mask='po' value='create_assets'>[% l('Load Bibs and Items') %]</option>
-                                            <!-- <option mask='*'  value='batch_apply_funds'>[% l('Apply Funds to Selected Items') %]</option> XXX moving to batch updater -->
-                                            <option mask='po' value='cancel_lineitems'>[% l('Cancel Selected Line Items') %]</option>
-                                            <option mask='po' value='apply_claim_policy'>[% l('Apply Claim Policy to Selected Line Items') %]</option><!-- can the functionality desired here be covered by the next thing? -->
-                                            <option mask='po' value='change_claim_policy'>[% l('Change Claim Policy for Selected Line Items') %]</option>
-                                            <option mask='po' value='receive_lineitems' id='receive_lineitems' disabled='disabled'>[% l('Mark Selected Line Items as Received') %]</option>
-                                            <option mask='po' value='rollback_receive_lineitems' id='rollback_receive_lineitems' disabled='disabled'>[% l('Un-Receive Selected Line Items') %]</option>
-                                            <option mask='po' value='batch_create_invoice'>[% l('Create Invoice From Selected Line Items') %]</option>
-                                            <option mask='po' value='batch_link_invoice'>[% l('Link Selected Line Items to Invoice') %]</option>
+                                            <!-- <option mask=''  value='batch_apply_funds'>[% l('Apply Funds to Selected Items') %]</option> XXX moving to batch updater -->
+                                            <option mask='ao|gs|vp' value='cancel_lineitems'>[% l('Cancel Selected Line Items') %]</option>
+                                            <option mask='po|ao|gs|vp' value='apply_claim_policy'>[% l('Apply Claim Policy to Selected Line Items') %]</option><!-- can the functionality desired here be covered by the next thing? -->
+                                            <option mask='po|ao|gs|vp' value='change_claim_policy'>[% l('Change Claim Policy for Selected Line Items') %]</option>
+                                            <option mask='ao|gs|vp' value='receive_lineitems' id='receive_lineitems' disabled='disabled'>[% l('Mark Selected Line Items as Received') %]</option>
+                                            <option mask='ao|gs|vp' value='rollback_receive_lineitems' id='rollback_receive_lineitems' disabled='disabled'>[% l('Un-Receive Selected Line Items') %]</option>
+                                            <option mask='ao|gs|vp' value='batch_create_invoice'>[% l('Create Invoice From Selected Line Items') %]</option>
+                                            <option mask='ao|gs|vp' value='batch_link_invoice'>[% l('Link Selected Line Items to Invoice') %]</option>
                                         </select>
                                         <span id="acq-lit-export-attr-holder" class="hidden">
                                             <input dojoType="dijit.form.FilteringSelect" id="acq-lit-export-attr" jsId="acqLitExportAttrSelector" labelAttr="description" searchAttr="description" />

diff --git a/Open-ILS/web/js/ui/default/acq/common/li_table.js b/Open-ILS/web/js/ui/default/acq/common/li_table.js
index 5f5df76..c905f5e 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -152,6 +152,28 @@ function AcqLiTable() {
         }
     };
 
+    this.enableActionsDropdownOptions = function(mask) {
+        /* 'mask' is probably a minomer the way I'm using it, but it needs to
+         * be one of pl,po,ao,gs,vp, or fs. */
+        dojo.query("option", "acq-lit-li-actions-selector").forEach(
+            function(option) {
+                var opt_mask = dojo.attr(option, "mask");
+
+                /* For each <option> element, an empty or non-existent mask
+                 * attribute, a mask attribute of "*", or a mask attribute that
+                 * matches this method's argument should result in that
+                 * option's being enabled. */
+                dojo.attr(
+                    option, "disabled", !(
+                        !opt_mask ||
+                        opt_mask == "*" ||
+                        opt_mask.search(mask) != -1
+                    )
+                );
+            }
+        );
+    };
+
     /*
      * Ensures this.focusLineitem is in view and causes a brief 
      * border around the lineitem to come to life then fade.

diff --git a/Open-ILS/web/js/ui/default/acq/lineitem/related.js b/Open-ILS/web/js/ui/default/acq/lineitem/related.js
index 0f3b91b..eb04bc4 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/lineitem/related.js
+++ b/Open-ILS/web/js/ui/default/acq/lineitem/related.js
@@ -142,6 +142,7 @@ function load() {
     }
 
     liTable = new AcqLiTable();
+    liTable.enableActionsDropdownOptions("vp");
     liTable.reset();
     liTable._isRelatedViewer = true;
 

diff --git a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
index 4345728..f0fa454 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/bib_search.js
@@ -25,6 +25,7 @@ var liTable;
 
 function drawForm() {
     liTable = new AcqLiTable();
+    liTable.enableActionsDropdownOptions("fs");
     liTable.skipInitialEligibilityCheck = true;
 
     fieldmapper.standardRequest(

diff --git a/Open-ILS/web/js/ui/default/acq/picklist/from_bib.js b/Open-ILS/web/js/ui/default/acq/picklist/from_bib.js
index 4853d16..a737c0b 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/from_bib.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/from_bib.js
@@ -67,7 +67,10 @@ function init() {
     new openils.widget.XULTermLoader(
         {"parentNode": "acq-frombib-upload", "parseCSV": true}
     ).build(function(w) { termLoader = w; });
+
     liTable = new AcqLiTable();
+    liTable.enableActionsDropdownOptions("vp");
+
     pager = new LiTablePager(fetchRecords, liTable);
 
     openils.Util.show("acq-frombib-begin-holder");

diff --git a/Open-ILS/web/js/ui/default/acq/picklist/view.js b/Open-ILS/web/js/ui/default/acq/picklist/view.js
index f44f743..55d2900 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/picklist/view.js
+++ b/Open-ILS/web/js/ui/default/acq/picklist/view.js
@@ -14,6 +14,8 @@ var liTable;
 function load() {
     liTable = new AcqLiTable();
     liTable.isPL = plId;
+    liTable.enableActionsDropdownOptions("pl");
+
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.picklist.retrieve.authoritative'],
         {   async: true,

diff --git a/Open-ILS/web/js/ui/default/acq/po/search.js b/Open-ILS/web/js/ui/default/acq/po/search.js
index 5ef4d24..ddf7f3a 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/po/search.js
+++ b/Open-ILS/web/js/ui/default/acq/po/search.js
@@ -97,6 +97,7 @@ function loadMetaPO(fields) {
     } else {
         if (!metaPO) {
             metaPO = new AcqLiTable();
+            metaPo.enableActionsDropdownOptions("po");
 
             /* We need to know the width (in cells) of the template row for
              * the LI table, and we don't want to hardcode it here. */

diff --git a/Open-ILS/web/js/ui/default/acq/po/view_po.js b/Open-ILS/web/js/ui/default/acq/po/view_po.js
index e207949..af8b844 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/po/view_po.js
+++ b/Open-ILS/web/js/ui/default/acq/po/view_po.js
@@ -317,6 +317,8 @@ function renderPo() {
 
     if(PO.order_date()) {
         openils.Util.show('acq-po-activated-on', 'inline');
+        liTable.enableActionsDropdownOptions("ao"); /* activated */
+
         dojo.byId('acq-po-activated-on').innerHTML = 
             dojo.string.substitute(
                 localeStrings.PO_ACTIVATED_ON, [
@@ -341,6 +343,8 @@ function renderPo() {
     } else {
         /* These things only make sense for not-ordered-yet POs */
 
+        liTable.enableActionsDropdownOptions("po");
+
         openils.Util.show("acq-po-zero-activate-label", "table-cell");
         openils.Util.show("acq-po-zero-activate", "table-cell");
 

diff --git a/Open-ILS/web/js/ui/default/acq/search/unified.js b/Open-ILS/web/js/ui/default/acq/search/unified.js
index a6be3f0..a59f4eb 100644 (file)
--- a/Open-ILS/web/js/ui/default/acq/search/unified.js
+++ b/Open-ILS/web/js/ui/default/acq/search/unified.js
@@ -976,8 +976,11 @@ openils.Util.addOnLoad(
 
         termManager = new TermManager();
 
+        var li_table = new AcqLiTable();
+        li_table.enableActionsDropdownOptions("gs");
+
         resultManager = new ResultManager(
-            new LiTablePager(null, new AcqLiTable()),
+            new LiTablePager(null, li_table),
             dijit.byId("acq-unified-po-grid"),
             dijit.byId("acq-unified-pl-grid"),
             dijit.byId("acq-unified-inv-grid")