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

[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  870a7fa4cb080a7e4eac550694b4a656fc278a83 (commit)
      from  1f5c30502a1c7923a8978d0f4e3d28618c5c07d4 (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 870a7fa4cb080a7e4eac550694b4a656fc278a83
Author: Cesar Velez <cesar.velez at equinoxinitiative.org>
Date:   Fri Jan 19 14:43:38 2018 -0500

    LP#1702557-Make Acq MarcEditor Just Have Save Button
    
    Like the changes to the z3950 marceditor UI, and serials,
    make the Acq marceditor have a simple Save button, instead
    of the Modify + Save Edits buttons needed to save a change.
    Same change as in 1710405, et al. Note this also fixes a
    propagation issue that prevented changes from marceditor's
    scope.marcXml from making it to the modal controller scope,
    and being saved. Props to miker for helping me debug this!
    
    Signed-off by: Cesar Velez <cesar.velez at equinoxinitiative.org>
    
    Signed-off-by: Kathy Lussier <klussier at masslnc.org>

diff --git a/Open-ILS/src/templates/staff/acq/t_edit_marc_order_record.tt2 b/Open-ILS/src/templates/staff/acq/t_edit_marc_order_record.tt2
index 1deeb5b..7fb287e 100644
--- a/Open-ILS/src/templates/staff/acq/t_edit_marc_order_record.tt2
+++ b/Open-ILS/src/templates/staff/acq/t_edit_marc_order_record.tt2
@@ -6,11 +6,9 @@
   </div>
   <div class="modal-body">
     <eg-marc-edit-record dirty-flag="dirty_flag" 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/acq/app.js b/Open-ILS/web/js/ui/default/staff/acq/app.js
index e97ea29..4be5753 100644
--- a/Open-ILS/web/js/ui/default/staff/acq/app.js
+++ b/Open-ILS/web/js/ui/default/staff/acq/app.js
@@ -80,7 +80,7 @@ function($scope , $routeParams , $location , $window , $timeout , egCore , $uibM
                 $scope.focusMe = true;
                 $scope.args = args;
                 $scope.dirty_flag = false;
-                $scope.ok = function(args) { $uibModalInstance.close(args) }
+                $scope.ok = function() { $uibModalInstance.close($scope.args) }
                 $scope.cancel = function () { $uibModalInstance.dismiss() }
             }]
         }).result.then(function (args) {
diff --git a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
index 24a08c1..c4708ea 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/services/marcedit.js
@@ -1368,7 +1368,7 @@ angular.module('egMarcMod', ['egCoreMod', 'ui.bootstrap'])
                 $scope.saveRecord = function () {
                     if ($scope.inPlaceMode) {
                         $scope.marcXml = $scope.record.toXmlString();
-                        return processOnSaveCallbacks();
+                        return $timeout(processOnSaveCallbacks);
                     }
                     $scope.mangle_005();
                     $scope.Record().editor(egCore.auth.user().id());

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

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


hooks/post-receive
-- 
Evergreen ILS