From: Mike Rylander <mrylander@gmail.com>
Date: Wed, 31 Aug 2016 16:37:14 +0000 (-0400)
Subject: Apply focus to the element tab-previous to the OK/Continue button in alert popups
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=826dfddf523bfcc3465485d9af715ea3ce23489e;p=working%2FEvergreen.git

Apply focus to the element tab-previous to the OK/Continue button in alert popups

Signed-off-by: Mike Rylander <mrylander@gmail.com>
---

diff --git a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2 b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
index 39d3d58a0c..c19f9a2abc 100644
--- a/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
+++ b/Open-ILS/src/templates/staff/share/t_copy_alert_manager_dialog.tt2
@@ -3,7 +3,7 @@
 -->
 <div>
   <div class="modal-header">
-    <button type="button" class="close" 
+    <button type="button" class="close" focus-me="no_statuses"
       ng-click="cancel()" aria-hidden="true">&times;</button>
     <h4 class="modal-title alert alert-info">[% l('Copy alerts') %]</h4> 
   </div>
@@ -33,7 +33,7 @@
             <label for="select-next-status"><b>[% l('Next copy status') %]<b></label>
           </div>
           <div class="col-md-4">
-            <select id="select-next-status" class="form-control"
+            <select id="select-next-status" class="form-control" focus-me="has_statuses"
                     ng-model="params.the_next_status"
                     ng-options="st.id() as st.name() for st in next_statuses">
             </select>
diff --git a/Open-ILS/web/js/ui/default/staff/services/ui.js b/Open-ILS/web/js/ui/default/staff/services/ui.js
index fa8e5ac720..782a976e72 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -524,6 +524,8 @@ function($uibModal , $interpolate , egCore) {
 
                     var next_statuses = [];
                     var seen_statuses = {};
+                    $scope.has_statuses = false;
+                    $scope.no_statuses = true;
                     $scope.next_statuses = [];
                     $scope.params = {
                         'the_next_status' : null
@@ -542,6 +544,10 @@ function($uibModal , $interpolate , egCore) {
                                     if (!seen_statuses[st]) {
                                         seen_statuses[st] = true;
                                         next_statuses.push(st);
+                                        if (next_statuses.length > 1) {
+                                            $scope.no_statuses = false;
+                                            $scope.has_statuses = true;
+                                        }
                                     }
                                 });
                             }