From 1d09a980da7ec49f5b4f0e85012f9fc487209997 Mon Sep 17 00:00:00 2001 From: Francis Lachapelle Date: Wed, 26 Oct 2016 15:44:43 -0400 Subject: [PATCH] (js) Add minimumSearchLength to sgSettings value --- UI/WebServerResources/js/Common/Common.app.js | 3 +++ .../js/Preferences/PreferencesController.js | 7 +++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/js/Common/Common.app.js b/UI/WebServerResources/js/Common/Common.app.js index 640106937..dd8064e85 100644 --- a/UI/WebServerResources/js/Common/Common.app.js +++ b/UI/WebServerResources/js/Common/Common.app.js @@ -34,6 +34,9 @@ return settings[param]; else return settings; + }, + minimumSearchLength: function() { + return angular.isNumber(minimumSearchLength)? minimumSearchLength : 2; } }) diff --git a/UI/WebServerResources/js/Preferences/PreferencesController.js b/UI/WebServerResources/js/Preferences/PreferencesController.js index 8230c2f6e..4d347bb57 100644 --- a/UI/WebServerResources/js/Preferences/PreferencesController.js +++ b/UI/WebServerResources/js/Preferences/PreferencesController.js @@ -7,8 +7,8 @@ /** * @ngInject */ - PreferencesController.$inject = ['$q', '$window', '$state', '$mdMedia', '$mdSidenav', '$mdDialog', '$mdToast', 'sgFocus', 'Dialog', 'User', 'Account', 'statePreferences', 'Authentication']; - function PreferencesController($q, $window, $state, $mdMedia, $mdSidenav, $mdDialog, $mdToast, focus, Dialog, User, Account, statePreferences, Authentication) { + PreferencesController.$inject = ['$q', '$window', '$state', '$mdMedia', '$mdSidenav', '$mdDialog', '$mdToast', 'sgSettings', 'sgFocus', 'Dialog', 'User', 'Account', 'statePreferences', 'Authentication']; + function PreferencesController($q, $window, $state, $mdMedia, $mdSidenav, $mdDialog, $mdToast, sgSettings, focus, Dialog, User, Account, statePreferences, Authentication) { var vm = this, account, mailboxes = [], today = new Date(), tomorrow = today.beginOfDay().addDays(1); vm.preferences = statePreferences; @@ -244,6 +244,9 @@ } function userFilter(search, excludedUsers) { + if (search.length < sgSettings.minimumSearchLength()) + return []; + return User.$filter(search, excludedUsers).then(function(users) { // Set users avatars _.forEach(users, function(user) {