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

[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  bfd5b2f43a0d603972440d727310c7f03a5583e1 (commit)
      from  21d821cf4d5092d26a0a9d987655dd1843f68663 (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 bfd5b2f43a0d603972440d727310c7f03a5583e1
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Thu Nov 30 15:36:35 2017 -0500

    LP#1710405 - remove Modify + Use Edits buttons in z3950 overlay
    
    The workflow for using a z3950 record to overlay a marked bib
    was confusing since it requires first saving the z3950 marc edits
    via the Modify button at the top, and only then hitting Use Edits,
    at the bottom of the modals. User often miss the click Modify part,
     thus this simplifies that, having just a "Save" button and a Cancel.
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Signed-off-by: Jason Etheridge <jason at EquinoxInitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/z3950/t_edit_overlay_record.tt2 b/Open-ILS/src/templates/staff/cat/z3950/t_edit_overlay_record.tt2
index 0362fe3..7ebc94e 100644
--- a/Open-ILS/src/templates/staff/cat/z3950/t_edit_overlay_record.tt2
+++ b/Open-ILS/src/templates/staff/cat/z3950/t_edit_overlay_record.tt2
@@ -6,11 +6,9 @@
   </div>
   <div class="modal-body">
     <eg-marc-edit-record dirty-flag="dirty_flag" record-id="record_id" marc-xml="args.marc_xml"
-                         in-place-mode="true" record-type="bre" save-label="[% l('Modify') %]" />
+                         on-save="ok" in-place-mode="true" record-type="bre" save-label="[% l('Save') %]" />
   </div>
   <div class="modal-footer">
-    <input type="submit" ng-click="ok(args)"
-        class="btn btn-primary" value="[% l('Use Edits') %]"/>
     <button class="btn btn-warning" ng-click="cancel()">[% l('Cancel') %]</button>
   </div>
 </div>
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 83be9ce..5e54ee5 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
@@ -380,7 +380,8 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
                 args.overlay_target = $scope.overlay_target;
                 $scope.ok = function(args) { $uibModalInstance.close(args) };
                 $scope.cancel = function () { $uibModalInstance.dismiss() };
-                $scope.editOverlayRecord = function() {
+                
+		$scope.editOverlayRecord = function() {
                     $uibModal.open({
                         templateUrl: './cat/z3950/t_edit_overlay_record',
                         backdrop: 'static',
@@ -391,7 +392,7 @@ function($scope , $q , $location , $timeout , $window,  egCore , egGridDataProvi
                             $scope.record_id = 0;
                             $scope.dirty_flag = false;
                             $scope.args = args;
-                            $scope.ok = function(args) { $uibModalInstance.close(args) }
+                            $scope.ok = function() { $uibModalInstance.close($scope.args) }
                             $scope.cancel = function () { $uibModalInstance.dismiss() }
                         }]
                     }).result.then(function (args) {

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

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


hooks/post-receive
-- 
Evergreen ILS