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

Evergreen Git git at git.evergreen-ils.org
Thu Sep 29 17:33:30 EDT 2016


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  a2b809e052c9913afde8075207144d40191cee28 (commit)
      from  9dd9dcaf74f72a84a46d9ac60a1d5c13ba932eff (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 a2b809e052c9913afde8075207144d40191cee28
Author: Remington Steed <rjs7 at calvin.edu>
Date:   Thu Sep 29 11:05:18 2016 -0400

    LP#802700 Sort funds by code and year
    
    This commit applies Bill Erickson's change from bug #1227344 to the fund
    selector that appears on the Selection List (picklist) screen when you click
    "Copies" to reveal the line items table. (Bill also mentioned this in
    bug #1266471.)
    
    Signed-off-by: Remington Steed <rjs7 at calvin.edu>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

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 1f02110..c54346b 100644
--- a/Open-ILS/web/js/ui/default/acq/common/li_table.js
+++ b/Open-ILS/web/js/ui/default/acq/common/li_table.js
@@ -30,6 +30,7 @@ var fundLabelFormat = [
 ];
 var fundSearchFormat = ['${0} (${1})', 'code', 'year'];
 var fundSearchFilter = {active : 't'};
+var fundSort = {order_by : {"acqf":"year DESC, code"}};
 
 function nodeByName(name, context) {
     return dojo.query('[name='+name+']', context)[0];
@@ -183,6 +184,7 @@ function AcqLiTable() {
                 "labelFormat": (field == 'fund') ? fundLabelFormat : null,
                 "searchFormat": (field == 'fund') ? fundSearchFormat : null,
                 "searchFilter": (field == 'fund') ? fundSearchFilter : null,
+                "searchOptions": (field == 'fund') ? fundSort : null,
                 "orgLimitPerms": (field == 'location') ? ['CREATE_PICKLIST', 'CREATE_PURCHASE_ORDER'] : [perms],
                 "dijitArgs": {
                     "required": false,

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

Summary of changes:
 Open-ILS/web/js/ui/default/acq/common/li_table.js |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list