[open-ils-commits] [GIT] Evergreen ILS branch rel_3_1 updated. 10e4be8363b77cc9cd708348f2a1fff46c16efb4

[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_1 has been updated
       via  10e4be8363b77cc9cd708348f2a1fff46c16efb4 (commit)
       via  2e199328052d71202b3a55a22263a3be82ad61d6 (commit)
      from  093e22d923c28d0a81c27fd2647e6ebbeaf9a2e5 (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 10e4be8363b77cc9cd708348f2a1fff46c16efb4
Author: Bill Erickson <berickxx at gmail.com>
Date:   Tue Aug 7 17:41:23 2018 -0400

    LP#621459 Clear Z39 overlay target message after overlay
    
    Reset the "Record with TCN XXX marked for overlay." message to show "No
    record marked for overlay." once the overlay target is cleared after a
    Z39 overlay.
    
    Removed an errant '"' in the overlay message.
    
    Signed-off-by: Bill Erickson <berickxx at gmail.com>
    Signed-off-by: Mike Rylander <mrylander at gmail.com>

diff --git a/Open-ILS/src/templates/staff/cat/z3950/t_list.tt2 b/Open-ILS/src/templates/staff/cat/z3950/t_list.tt2
index 68c2fbf..9d7ef21 100644
--- a/Open-ILS/src/templates/staff/cat/z3950/t_list.tt2
+++ b/Open-ILS/src/templates/staff/cat/z3950/t_list.tt2
@@ -73,7 +73,7 @@
         [% l('Total hits: [_1]', '{{total_hits}}') %]
     </div>
     <div class="col-md-6 text-right" ng-if="local_overlay_target">
-        [% l('Record with TCN [_1] marked for overlay.', '{{local_overlay_target}}') %]"
+        [% l('Record with TCN [_1] marked for overlay.', '{{local_overlay_target}}') %]
     </div>
     <div class="col-md-6 text-right" ng-if="!local_overlay_target">
         [% l('No record marked for overlay.') %]
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 31ff1ce..2e67eea 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
@@ -449,6 +449,7 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
                 $scope.selectFieldStripGroups()
             ).then(
                 function(result) {
+                    $scope.local_overlay_target = 0;
                     egCore.hatch.removeLocalItem('eg.cat.marked_overlay_record');
                     console.debug('overlay complete, target removed');
                 }

commit 2e199328052d71202b3a55a22263a3be82ad61d6
Author: Mike Rylander <mrylander at gmail.com>
Date:   Fri Aug 3 11:00:25 2018 -0400

    LP#621459: Discard overlay target after merge in Z39.50 interface
    
    Cataloger concensus is that we should discard the overlay target after a merge
    is completed in order to help avoid accidental re-overlay.
    
    Signed-off-by: Mike Rylander <mrylander at gmail.com>
    Signed-off-by: Bill Erickson <berickxx at gmail.com>

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 b48c4df..31ff1ce 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
@@ -449,7 +449,8 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
                 $scope.selectFieldStripGroups()
             ).then(
                 function(result) {
-                    console.debug('overlay complete');
+                    egCore.hatch.removeLocalItem('eg.cat.marked_overlay_record');
+                    console.debug('overlay complete, target removed');
                 }
             );            
         });

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

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


hooks/post-receive
-- 
Evergreen ILS