This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository coselmar. See http://git.codelutin.com/coselmar.git commit 701d3f6abd44475c9f4db0a6337250d0367573f7 Author: Yannick Martel <martel@©odelutin.com> Date: Tue Dec 16 09:55:24 2014 +0100 #6302 on question, clients could be anyone from system --- .../fr/ifremer/coselmar/converter/BeanEntityConverter.java | 5 ++++- coselmar-ui/src/main/webapp/js/coselmar-controllers.js | 2 +- coselmar-ui/src/main/webapp/views/questions/editquestion.html | 10 +++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java index 7c6848b..1192d6e 100644 --- a/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java +++ b/coselmar-rest/src/main/java/fr/ifremer/coselmar/converter/BeanEntityConverter.java @@ -99,7 +99,10 @@ public class BeanEntityConverter { user.setFirstname(userBean.getFirstName()); user.setName(userBean.getName()); user.setMail(userBean.getMail()); - user.setRole(CoselmarUserRole.valueOf(userBean.getRole())); + String role = userBean.getRole(); + if (StringUtils.isNotBlank(role)) { + user.setRole(CoselmarUserRole.valueOf(role)); + } user.setQualification(userBean.getQualification()); user.setOrganization(userBean.getOrganization()); user.setActive(userBean.isActive()); diff --git a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js index 4b5cece..cf7e392 100644 --- a/coselmar-ui/src/main/webapp/js/coselmar-controllers.js +++ b/coselmar-ui/src/main/webapp/js/coselmar-controllers.js @@ -397,7 +397,7 @@ coselmarControllers.controller("QuestionCtrl", ['$scope', '$route', '$routeParam searchKeywords.push(searchKeyword); } - questionsService.findUsers({'role': 'CLIENT', 'active': 'true', 'fullTextSearch' : searchKeywords}, function(users) { + questionsService.findUsers({'active': 'true', 'fullTextSearch' : searchKeywords}, function(users) { $scope.users.clients = users; $scope.clientsIndex = {}; angular.forEach($scope.users.clients, function(client) { diff --git a/coselmar-ui/src/main/webapp/views/questions/editquestion.html b/coselmar-ui/src/main/webapp/views/questions/editquestion.html index 1ea349b..b0e79c1 100644 --- a/coselmar-ui/src/main/webapp/views/questions/editquestion.html +++ b/coselmar-ui/src/main/webapp/views/questions/editquestion.html @@ -158,7 +158,7 @@ <ui-select-choices repeat="expert in users.participants track by expert.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" refresh="refreshExperts($select.search)" - refresh-delay="1000"> + refresh-delay="500"> {{expert.firstName}} {{expert.name}} ({{expert.organization}}) </ui-select-choices> </ui-select> @@ -181,7 +181,9 @@ </ui-select-match> <ui-select-choices - repeat="expert in users.clients | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}"> + repeat="expert in users.clients | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" + refresh="refreshClients($select.search)" + refresh-delay="500"> {{expert.firstName}} {{expert.name}} ({{expert.organization}}) </ui-select-choices> </ui-select> @@ -227,7 +229,9 @@ </ui-select-match> <ui-select-choices - repeat="expert in users.supervisors track by expert.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}"> + repeat="expert in users.supervisors track by expert.id | propsFilter: {name: $select.search, firstName: $select.search, organization: $select.search}" + refresh="refreshSupervisors($select.search)" + refresh-delay="500"> {{expert.firstName}} {{expert.name}} ({{expert.organization}}) </ui-select-choices> </ui-select> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.