From e9e5e9a7f4d9f85da84f01a8bc3867ed83856cbb Mon Sep 17 00:00:00 2001
From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Thu, 6 Jul 2017 17:14:15 -0400
Subject: [PATCH] LP#1708291: teach egBasicComboBox and egDatePicker to accept
 focusMe

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
Signed-off-by: Kathy Lussier <klussier@masslnc.org>

Conflicts:
	Open-ILS/web/js/ui/default/staff/services/ui.js

Signed-off-by: Dan Wells <dbw2@calvin.edu>
---
 Open-ILS/src/templates/staff/share/t_datetime.tt2 | 1 +
 Open-ILS/web/js/ui/default/staff/services/ui.js   | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Open-ILS/src/templates/staff/share/t_datetime.tt2 b/Open-ILS/src/templates/staff/share/t_datetime.tt2
index 635921261e..492fa1c82f 100644
--- a/Open-ILS/src/templates/staff/share/t_datetime.tt2
+++ b/Open-ILS/src/templates/staff/share/t_datetime.tt2
@@ -14,6 +14,7 @@
         ng-blur="ngBlur"
         ng-disabled="ngDisabled"
         ng-required="ngRequired"
+        focus-me="focusMe"
         close-text="{{closeText}}"/>
       <span class="input-group-btn">
         <button type="button" class="btn btn-default"
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 6513459c2f..aa95d167e0 100644
--- a/Open-ILS/web/js/ui/default/staff/services/ui.js
+++ b/Open-ILS/web/js/ui/default/staff/services/ui.js
@@ -594,10 +594,11 @@ function($window , egStrings) {
             selected: "=",
             egDisabled: "=",
             allowAll: "@",
+            focusMe: "=?"
         },
         template:
             '<div class="input-group">'+
-                '<input type="text" ng-disabled="egDisabled" class="form-control" ng-model="selected" ng-change="makeOpen()">'+
+                '<input type="text" ng-disabled="egDisabled" class="form-control" ng-model="selected" ng-change="makeOpen()" focus-me="focusMe">'+
                 '<div class="input-group-btn" dropdown ng-class="{open:isopen}">'+
                     '<button type="button" ng-click="showAll()" class="btn btn-default dropdown-toggle"><span class="caret"></span></button>'+
                     '<ul class="dropdown-menu dropdown-menu-right">'+
@@ -852,7 +853,8 @@ function($window , egStrings) {
                 ngRequired : '=',
                 hideDatePicker : '=',
                 dateFormat : '=?',
-                outOfRange : '=?'
+                outOfRange : '=?',
+                focusMe : '=?'
             },
             require: 'ngModel',
             templateUrl: './share/t_datetime',
-- 
2.11.0