[open-ils-commits] [GIT] Evergreen ILS branch master updated. b26ee40b0403d1db5f58f8bf19fa7459fd25aef1

[Evergreen Git]

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  b26ee40b0403d1db5f58f8bf19fa7459fd25aef1 (commit)
       via  a261d6827ca7e09fd9aee9ca86cf29321d25e30a (commit)
      from  b15a61ffc934e5e4f558de69505f904b4de0d2e3 (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 b26ee40b0403d1db5f58f8bf19fa7459fd25aef1
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Oct 27 14:15:18 2015 -0400

    LP#1510641 Release notes (PO actions selector)
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at esilibrary.com>

diff --git a/docs/RELEASE_NOTES_NEXT/Acquisitions/po-actions-selector.txt b/docs/RELEASE_NOTES_NEXT/Acquisitions/po-actions-selector.txt
new file mode 100644
index 0000000..4602acf
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Acquisitions/po-actions-selector.txt
@@ -0,0 +1,9 @@
+PO Actions Selector Always Visible
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+The actions selector is now always visible in the purchase order view,
+even when no lineitems exist.  With this, users can print PO's that
+only contain direct charges.
+
+The custom "Add Brief Record" button is no longer present, since the
+same action is accessible via the now-visible selector.

commit a261d6827ca7e09fd9aee9ca86cf29321d25e30a
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Oct 27 14:08:53 2015 -0400

    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 at gmail.com>
    Signed-off-by: Galen Charlton <gmc at 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
--- 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;"> </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
--- 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
--- 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');
             }
         }
     );

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/templates/acq/common/li_table.tt2     |    7 ++++---
 Open-ILS/src/templates/acq/po/view.tt2             |    5 -----
 Open-ILS/web/js/ui/default/acq/po/view_po.js       |    3 ---
 .../Acquisitions/po-actions-selector.txt           |    9 +++++++++
 4 files changed, 13 insertions(+), 11 deletions(-)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Acquisitions/po-actions-selector.txt


hooks/post-receive
-- 
Evergreen ILS