[open-ils-commits] [GIT] Evergreen ILS branch rel_2_8 updated. 94ead2bffc571ce8a111834ad9845765148b857d

Evergreen Git git at git.evergreen-ils.org
Fri Sep 4 11:47:48 EDT 2015


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_2_8 has been updated
       via  94ead2bffc571ce8a111834ad9845765148b857d (commit)
      from  c7c42958f717f07267ed6af115cc2e959f6cbc74 (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 94ead2bffc571ce8a111834ad9845765148b857d
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Jul 7 15:49:59 2015 -0400

    LP#1472380 Display all Vandelay authority matches
    
    Ensure a row is added for every authority record match in the Vandelay
    match grid, even when multiple matches refer to the same authority
    record.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>

diff --git a/Open-ILS/web/js/ui/default/vandelay/vandelay.js b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
index 64bef54..682bade 100644
--- a/Open-ILS/web/js/ui/default/vandelay/vandelay.js
+++ b/Open-ILS/web/js/ui/default/vandelay/vandelay.js
@@ -649,8 +649,26 @@ function vlLoadMatchUI(recId) {
                 currentMatchedRecords = recs;
                 vlMatchGrid.setStructure(vlMatchGridLayout);
 
+                var cls = 'bre';
+                if (currentType == 'auth') {
+                    cls = 'are';
+
+                    // When fetching authority records from matches, we 
+                    // only fetch one instance of each record, even though
+                    // it may be used by multiple matches.  Modify the
+                    // array of records so that each match has a 
+                    // corresponding authority record in the list.
+                    var new_recs = [];
+                    dojo.forEach(matches, function(match) {
+                        var rec = recs.filter(function(r) { 
+                            return r.id() == match.eg_record() })[0];
+                        new_recs.push(rec);
+                    });
+                    recs = new_recs;
+                }
+
                 // build the data store of records with match information
-                var dataStore = bre.toStoreData(recs, null, 
+                var dataStore = fieldmapper[cls].toStoreData(recs, null,
                     {virtualFields:['_id', 'match_score', 'match_quality', 'rec_quality']});
                 dataStore.identifier = '_id';
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/vandelay/vandelay.js |   20 +++++++++++++++++++-
 1 files changed, 19 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS


More information about the open-ils-commits mailing list