LP#1510641 Always show actions selector in PO view

Ensure the actions selector is always visible for PO's, even when no
lineitems are present.  This allows printing and history view (and
potentially future actions) for PO's that only contain direct charges.

The custom Add Brief Record button is no longer present, since the same
action is accessible from the actions selector.

Signed-off-by: Bill Erickson <berickxx@gmail.com>
Signed-off-by: Galen Charlton <gmc@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 9ebc8ad..5dbba8e 100644 (file)
--- a/Open-ILS/src/templates/acq/common/li_table.tt2
+++ b/Open-ILS/src/templates/acq/common/li_table.tt2
@@ -3,9 +3,9 @@
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/common/li_table.js'> </script>
 <script type="text/javascript" src='[% ctx.media_prefix %]/js/ui/default/acq/financial/claim_voucher.js'> </script>
 <div id='acq-lit-table-container'>
-    <div id='acq-lit-table-div' class='hidden'>
 
-        <!-- Line Item (bib record) list -->
+    <div> <!-- Container for actions selector and paging controls.
+           This container and the actions selector are always visible -->
         <div style="float: left;">
             <span>
                 <select id="acq-lit-li-actions-selector">
@@ -61,7 +61,8 @@
             </div>
         </div>
         <div style="clear: both;">&nbsp;</div><!-- XXX better way to end effects of float: left/right ? -->
-
+    </div>
+    <div id='acq-lit-table-div' class='hidden'>
         <table id="acq-batch-update" class="hidden"><!-- XXX freeze in place w/ CSS? -->
             <tr>
                 <th>

diff --git a/Open-ILS/src/templates/acq/po/view.tt2 b/Open-ILS/src/templates/acq/po/view.tt2
index 9aa8b11..2bed1ee 100644 (file)
--- a/Open-ILS/src/templates/acq/po/view.tt2
+++ b/Open-ILS/src/templates/acq/po/view.tt2
@@ -160,11 +160,6 @@
     </script>
     [% INCLUDE 'acq/common/li_table.tt2' %]
     [% INCLUDE "acq/common/notes.tt2" which = "Po" %]
-    <div class='hidden' id='acq-po-no-lineitems'>
-        <button type='dijit.form.Button' onclick='location.href = oilsBasePath + "/acq/picklist/brief_record?po=" + poId'>
-            [% l('Add Brief Record') %]
-        </button>
-    </div>
     [% INCLUDE "acq/po/item_table.tt2" %]
 </div>
 [% END %]

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 f9f633d..10e063e 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
@@ -477,7 +477,6 @@ function init() {
 
 function init2() {
 
-    var zeroLi = true;
     fieldmapper.standardRequest(
         ['open-ils.acq', 'open-ils.acq.lineitem.search'],
         {   async: true,
@@ -487,7 +486,6 @@ function init2() {
                 {flesh_attrs:true, flesh_notes:true, flesh_cancel_reason:true, clear_marc:true}
             ],
             onresponse: function(r) {
-                zeroLi = false;
                 liTable.show('list');
                 var li = openils.Util.readResponse(r);
                 liTable.addLineitem(li);
@@ -495,7 +493,6 @@ function init2() {
 
             oncomplete : function() {
                 if (liFocus) liTable.drawCopies(liFocus);
-                if(zeroLi) openils.Util.show('acq-po-no-lineitems');
             }
         }
     );