[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. 05d0cda2a1c36ffbcccc7dee5c610f821429613e

[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, rel_3_3 has been updated
       via  05d0cda2a1c36ffbcccc7dee5c610f821429613e (commit)
      from  1d4707876949dc97d8ff2dc13f1d163dc588bd79 (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 05d0cda2a1c36ffbcccc7dee5c610f821429613e
Author: Bill Erickson <berickxx at gmail.com>
Date:   Wed Apr 17 10:51:45 2019 -0400

    LP1683385 AngJS grid avoid dupe auto-fields
    
    When generating grid fields from an IDL class in the AngJS grid, avoid
    adding any fields that match fields already defined in the markup.
    
    An example of such a grid is the Pending Item Buckets page.
    
    To test
    -------
    [1] Go to Item Buckets and add an item to the Pending Items page.
    [2] Note that in the column picker there are two barcode fields,
        one that hyperlinks the item and one that does not.
    [3] Apply the patch and repeat steps 1-2.
    [4] This time, there is only one barcode column (the one that
        hyperlinks the results).
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/web/js/ui/default/staff/services/grid.js b/Open-ILS/web/js/ui/default/staff/services/grid.js
index 3998abba1e..5c9d5f0fdf 100644
--- a/Open-ILS/web/js/ui/default/staff/services/grid.js
+++ b/Open-ILS/web/js/ui/default/staff/services/grid.js
@@ -1584,6 +1584,9 @@ angular.module('egGridMod',
                 idl_class.fields,
                 function(field) {
                     if (field.virtual) return;
+                    // Columns declared in the markup take precedence
+                    // of matching auto-columns.
+                    if (cols.findColumn(field.name)) return;
                     if (field.datatype == 'link' || field.datatype == 'org_unit') {
                         // if the field is a link and the linked class has a
                         // "selector" field specified, use the selector field

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/services/grid.js | 3 +++
 1 file changed, 3 insertions(+)


hooks/post-receive
-- 
Evergreen ILS