From 86b7e0e60726ab5f117d93990ced8d5e819e2dce Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@esilibrary.com>
Date: Tue, 6 Oct 2015 18:26:30 +0000
Subject: [PATCH] webstaff: teach side-by-side editing to the record merge
 interface

It is now possible to edit the lead record in place (in
flat editor mode).

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>
---
 .../staff/cat/bucket/record/t_merge_records.tt2          | 9 +++++++--
 .../web/js/ui/default/staff/cat/bucket/record/app.js     | 9 ++++++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

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 7efdcbc205..53821f81a2 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
@@ -9,8 +9,13 @@
           <div class="col-xs-6">
             <h4>[% l('Lead record') %]</h4>
             <div ng-if="lead_id">
-               <button class="btn btn-default btn-sm" ng-click="edit_lead()">[% l('Edit') %]</button>
-               <eg-record-breaker record-id="lead_id"></eg-record-breaker>
+               <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead_inplace()">[% l('Edit') %]</button>
+               <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" ng-click="edit_lead()">[% l('Edit using full editor') %]</button>
+               <eg-marc-edit-record dirty-flag="dirty_flag" record-id="lead_id"
+                         record-type="bre" flat-only="true" embedded="true" 
+                         ng-if="editing_inplace" on-save="post_edit_inplace">
+               </eg-marc-edit-record>
+               <eg-record-breaker record-id="lead_id" ng-if="!editing_inplace"></eg-record-breaker>
                <eg-volume-list record-id="lead_id"></eg-volume-list>
             </div>
             <div ng-if="!lead_id">
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 de620f0e58..7ace3802bf 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
@@ -550,6 +550,7 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                 ['$scope', '$modalInstance', function($scope, $modalInstance) {
                 $scope.records = [];
                 $scope.lead_id = 0;
+                $scope.editing_inplace = false;
                 angular.forEach(records, function(rec) {
                     $scope.records.push({ id : rec.id });
                 });
@@ -574,6 +575,12 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                         }
                     });
                 }
+                $scope.post_edit_inplace = function() {
+                    $scope.editing_inplace = false;
+                }
+                $scope.edit_lead_inplace = function() {
+                    $scope.editing_inplace = true;
+                }
                 $scope.edit_lead = function() {
                     var lead_id = $scope.lead_id;
                     $modal.open({
@@ -588,7 +595,7 @@ function($scope,  $q , $routeParams,  bucketSvc,  egCore,  $window,
                             $scope.cancel = function () { $modalInstance.dismiss() }
                         }]
                     }).result.then(function() {
-                        // TODO: need a way to force a refresh of the egRecordHtml, as
+                        // TODO: need a way to force a refresh of the egRecordBreaker, as
                         // the record ID does not change
                     });
                 };
-- 
2.43.2