From 7225d8c488fa8e71d18d2f5ef4a3d0ed65d79f04 Mon Sep 17 00:00:00 2001
From: Kyle Huckins <khuckins@catalyte.io>
Date: Thu, 11 Jul 2019 16:36:36 +0000
Subject: [PATCH] lp1836229 Disable Edit buttons in Merge Records when Editing

- Apply disabled attribute to Edit buttons rather than just the class,
preventing users from clicking buttons that appear disabled in the Merge UI.

Signed-off-by: Kyle Huckins <khuckins@catalyte.io>

 Changes to be committed:
	modified:   Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2

Signed-off-by: Garry Collum <gcollum@gmail.com>
Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---
 .../src/templates/staff/cat/bucket/record/t_merge_records.tt2 | 4 ++--
 1 file changed, 2 insertions(+), 2 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 cdfed1973c..f449e7f288 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
@@ -37,9 +37,9 @@
           ng-class="{'record-merge-container': !editing_inplace, 'record-edit-container': editing_inplace}">
           <tabset>
             <tab heading="[% l('Bib [_1]', '{{lead_id}}') %]">
-              <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" 
+              <button class="btn btn-default btn-sm" ng-disabled="editing_inplace"
                 ng-click="edit_lead_inplace()">[% l('Edit') %]</button>
-              <button class="btn btn-default btn-sm" ng-class="{disabled : editing_inplace}" 
+              <button class="btn btn-default btn-sm" ng-disabled="editing_inplace"
                 ng-click="edit_lead()">[% l('Edit using full editor') %]</button>
               <eg-marc-edit-record dirty-flag="dirty_flag" marc-xml="lead.marc_xml"
                  in-place-mode="true" record-type="bre" embedded="true" 
-- 
2.43.2