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

[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  bcdaec0f45da0230c719160f47ba24df64a23bd2 (commit)
      from  4f2117f2016dc5542e9c5b45069c653d65f243c1 (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 bcdaec0f45da0230c719160f47ba24df64a23bd2
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Tue Feb 28 13:59:24 2017 -0500

    LP#1668725: fix Z39.50 overlay when no profile set
    
    This patch fix an issue where, when performing an overlay
    of a record from Z39.50 in the web staff client, if no
    merge profile is set, the incoming record is not displayed
    in the right-hand pane of the merge dialog.
    
    To test
    -------
    [1] Select an overlay target, then use the web staff
        Z39.50 search interface to find a record to overlay
        it with.
    [2] Open the Z39.50 overlay dialog and verify that no
        profile is set (you may need to clear the
        eg.cat.z3950.default_merge_profile key to ensure this).
    [3] Note that the incoming record from Z39.50 doesn't display
        in the right-hand pane.
    [4] Apply the page, then repeat step 2. This time, the incoming
        record should be displayed.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
index dac7c37..b6be459 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/z3950/app.js
@@ -312,10 +312,10 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
                     merged : false
                 };
 
+                $scope.overlay_target.marc_xml = args.marc_xml;
                 egCore.pcrud.retrieve('bre', $scope.overlay_target.id)
                 .then(function(rec) {
                     $scope.overlay_target.orig_marc_xml = rec.marc();
-                    $scope.overlay_target.marc_xml = rec.marc();
                     $scope.merge_marc(); // in case a sticky value was already set
                 });
 

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

Summary of changes:
 Open-ILS/web/js/ui/default/staff/cat/z3950/app.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Evergreen ILS