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

[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  7225d8c488fa8e71d18d2f5ef4a3d0ed65d79f04 (commit)
      from  59136d13f11c5db351277c7b9932774d2df7d6ac (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 7225d8c488fa8e71d18d2f5ef4a3d0ed65d79f04
Author: Kyle Huckins <khuckins at catalyte.io>
Date:   Thu Jul 11 16:36:36 2019 +0000

    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 at 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 at gmail.com>
    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 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" 

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

Summary of changes:
 Open-ILS/src/templates/staff/cat/bucket/record/t_merge_records.tt2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS