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

[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  5e4304589abce95735bd6c9e277a93baad443c4d (commit)
       via  c7d8b257a2d13c750d66cff861d0ed09444601a4 (commit)
      from  1c24940dfa0a8bc8830764fd0457fc3572370b7c (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 5e4304589abce95735bd6c9e277a93baad443c4d
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Wed Jul 31 14:12:48 2019 -0400

    LP#1836808: add release notes
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/docs/RELEASE_NOTES_NEXT/Cataloging/Cancel_Edit_Button_In_Record_Merge_UI.adoc b/docs/RELEASE_NOTES_NEXT/Cataloging/Cancel_Edit_Button_In_Record_Merge_UI.adoc
new file mode 100644
index 0000000000..14b7860178
--- /dev/null
+++ b/docs/RELEASE_NOTES_NEXT/Cataloging/Cancel_Edit_Button_In_Record_Merge_UI.adoc
@@ -0,0 +1,6 @@
+New Cancel Edit Button In Record Merge Interface
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+The web staff client's Record Merge dialog now has a "Cancel Edit"
+button that is displayed when editing the lead record in place. Using
+this button will abandon any pending record edits without requiring
+that the entire dialog be dismissed.

commit c7d8b257a2d13c750d66cff861d0ed09444601a4
Author: Mike Risher <mrisher at catalyte.io>
Date:   Wed Jul 17 17:26:34 2019 +0000

    lp1836808 add cancel button to merge edit
    
    In the merge UI add a button so one can cancel out of editing mode
    
    To test
    -------
    [1] Apply the patch and create/find a record bucket that has at least
        two records.
    [2] In the Record Buckets interface, select two records and invoke
        the Merge Selected Records action.
    [3] Select one record as the lead record, then click the Edit button.
    [4] Verify that a "Cancel Edit" button is displayed. Make changes to
        the record, then click "Cancel Edit".
    [5] Verify that the contents of the record have not changed.
    [6] Click the Edit button again; verify that the record is at its
        original state. Make changes, then save them.
    [7] Verify that the lead record has been updated.
    
    Signed-off-by: Mike Risher <mrisher at catalyte.io>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>

diff --git a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
index b2bcbc5566..d1cbbc4806 100644
--- a/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
+++ b/Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2
@@ -51,6 +51,8 @@
                 ng-click="edit_lead_inplace()">[% l('Edit') %]</button>
               <button class="btn btn-default btn-sm" ng-disabled="editing_inplace"
                 ng-click="edit_lead()">[% l('Edit using full editor') %]</button>
+              <button class="btn btn-default btn-sm" ng-show="editing_inplace"
+                ng-click="cancel_edit_lead_inplace()">[% l('Cancel Edit') %]</button>
               <eg-marc-edit-record dirty-flag="dirty_flag" marc-xml="lead.marc_xml"
                  in-place-mode="true" record-type="bre" embedded="true" 
                  ng-show="editing_inplace" on-save="post_edit_inplace">
diff --git a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
index 8aaa4db80b..14ebe42e76 100644
--- a/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
+++ b/Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js
@@ -664,8 +664,15 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                     updateOneRecord($scope.lead_id, $scope.lead.marc_xml);
                 }
 
+                $scope.cancel_edit_lead_inplace = function() {
+                    $scope.editing_inplace = false;
+                    $scope.lead.marc_xml = $scope.lead.orig_marc_xml;
+                }
+
                 $scope.edit_lead_inplace = function() {
                     $scope.editing_inplace = true;
+                    let lead = { orig_marc_xml : $scope.lead.marc_xml };
+                    $scope.lead = lead;
                 }
                 $scope.edit_lead = function() {
                     var lead = { marc_xml : $scope.lead.marc_xml };

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

Summary of changes:
 Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 | 2 ++
 Open-ILS/web/js/ui/default/staff/cat/bucket/record/app.js          | 7 +++++++
 .../Cataloging/Cancel_Edit_Button_In_Record_Merge_UI.adoc          | 6 ++++++
 3 files changed, 15 insertions(+)
 create mode 100644 docs/RELEASE_NOTES_NEXT/Cataloging/Cancel_Edit_Button_In_Record_Merge_UI.adoc


hooks/post-receive
-- 
Evergreen ILS