[open-ils-commits] [GIT] Evergreen ILS branch rel_3_3 updated. f62cea11ae59de16f9142754199b0ac0c0df2738

[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, rel_3_3 has been updated
       via  f62cea11ae59de16f9142754199b0ac0c0df2738 (commit)
      from  7ed4b2540cdfbbc4a0bc820631e9c080e500b575 (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 f62cea11ae59de16f9142754199b0ac0c0df2738
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