This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 92566c50fe78dadd097308ba3e8ea32129222480 Author: Kevin Morin <morin@codelutin.com> Date: Tue Feb 7 19:06:00 2017 +0100 fixes #9031 correction des sélections des listes --- .../WEB-INF/content/admin/configuration-input.jsp | 27 ++++++++++++++-------- .../src/main/webapp/js/configuration.js | 25 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 9 deletions(-) diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index e971d75..2854f51 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -327,7 +327,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addStampUser()" ng-disabled="!newStampUser"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newStampUserField" ng-model="newStampUser" theme="bootstrap"> + <ui-select id="newStampUserField" ng-model="newStampUser" theme="bootstrap" + on-select="onSelectStampUserCallback($item, $model)"> <ui-select-match>{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> <ui-select-choices repeat="user in users | filter:filterByAlreadyInCollection(selectedStamp.users) | filter: $select.search"> <div ng-bind-html="user.firstName + ' ' + user.lastName | highlight: $select.search"></div> @@ -342,7 +343,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addStampGroup()" ng-disabled="!newStampGroup"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newStampGroupField" ng-model="newStampGroup" theme="bootstrap"> + <ui-select id="newStampGroupField" ng-model="newStampGroup" theme="bootstrap" + on-select="onSelectStampGroupCallback($item, $model)"> <ui-select-match>{{$select.selected.completeName}}</ui-select-match> <ui-select-choices repeat="group in groups | filter:filterByAlreadyInCollection(selectedStamp.groups) | filter: $select.search"> <div ng-bind-html="group.completeName | highlight: $select.search"></div> @@ -756,7 +758,9 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addCustomerResponsible()" ng-disabled="!newCustomerResponsible"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newCustomerResponsibleField" ng-model="newCustomerResponsible" theme="bootstrap"> + <ui-select id="newCustomerResponsibleField" ng-model="newCustomerResponsible" + name="newCustomerResponsible" theme="bootstrap" + on-select="onSelectCustomerResponsibleCallback($item, $model)"> <ui-select-match>{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> <ui-select-choices repeat="user in users | filter:filterByAlreadyInCollection(selectedMailFolder.customerResponsibles) | filter: $select.search"> <div ng-bind-html="user.firstName + ' ' + user.lastName | highlight: $select.search"></div> @@ -1159,7 +1163,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addRightUser()" ng-disabled="!newRightUser"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newRightUserField" ng-model="newRightUser" theme="bootstrap"> + <ui-select id="newRightUserField" ng-model="newRightUser" theme="bootstrap" + on-select="onSelectRightUserCallback($item, $model)"> <ui-select-match>{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> <ui-select-choices repeat="user in users | filter:filterByAlreadyInCollection(selectedMailFolder.rightUsers) | filter: $select.search"> <div ng-bind-html="user.firstName + ' ' + user.lastName | highlight: $select.search"></div> @@ -1174,7 +1179,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newRightGroupField" ng-model="newRightGroup" theme="bootstrap"> + <ui-select id="newRightGroupField" ng-model="newRightGroup" theme="bootstrap" + on-select="onSelectRightGroupCallback($item, $model)"> <ui-select-match>{{$select.selected.completeName}}</ui-select-match> <ui-select-choices repeat="group in groups | filter:filterByAlreadyInCollection(selectedMailFolder.rightGroups) | filter: $select.search"> <div ng-bind-html="group.completeName | highlight: $select.search"></div> @@ -1263,7 +1269,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addRightUser()" ng-disabled="!newRightUser"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newRightUserField" ng-model="newRightUser" theme="bootstrap"> + <ui-select id="newRightUserField" ng-model="newRightUser" theme="bootstrap" + on-select="onSelectRightUserCallback($item, $model)"> <ui-select-match>{{$select.selected.firstName}} {{$select.selected.lastName}}</ui-select-match> <ui-select-choices repeat="user in users | filter:filterByAlreadyInCollection(selectedMailFolder.rightUsers) | filter: $select.search"> <div ng-bind-html="user.firstName + ' ' + user.lastName | highlight: $select.search"></div> @@ -1278,7 +1285,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newRightGroupField" ng-model="newRightGroup" theme="bootstrap"> + <ui-select id="newRightGroupField" ng-model="newRightGroup" theme="bootstrap" + on-select="onSelectRightGroupCallback($item, $model)"> <ui-select-match>{{$select.selected.completeName}}</ui-select-match> <ui-select-choices repeat="group in groups | filter:filterByAlreadyInCollection(selectedMailFolder.rightGroups) | filter: $select.search"> <div ng-bind-html="group.completeName | highlight: $select.search"></div> @@ -1621,7 +1629,7 @@ <div class="form"> <div class="form-group required"> <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> - <ui-select id="newRightGroupField" ng-model="selectedGroupChef.userGroup" + <ui-select id="groupChefUserGroupField" ng-model="selectedGroupChef.userGroup" ng-required="true" theme="bootstrap"> <ui-select-match>{{$select.selected.completeName}}</ui-select-match> <ui-select-choices repeat="group in groups | filter:availableNewGroupChef | filter: $select.search"> @@ -1659,7 +1667,8 @@ <a class="btn btn-success btn-xs pull-right" ng-click="addManagedGroup()" ng-disabled="!newManagedGroup"> <span class="glyphicon glyphicon-plus"></span> </a> - <ui-select id="newManagedGroupField" ng-model="newManagedGroup" theme="bootstrap"> + <ui-select id="newManagedGroupField" ng-model="newManagedGroup" theme="bootstrap" + on-select="onSelectManagedGroupCallback($item, $model)"> <ui-select-match>{{$select.selected.completeName}}</ui-select-match> <ui-select-choices repeat="group in groups | filter:filterByAlreadyInCollection(selectedGroupChef.managedGroups) | filter: $select.search"> <div ng-bind-html="group.completeName | highlight: $select.search"></div> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 1bbc0c0..f401166 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -508,6 +508,14 @@ ConfigurationModule.controller('ConfigurationStampsController', ['$scope', '$win } }; + $scope.onSelectStampUserCallback = function (item, model) { + $scope.newStampUser = item; + }; + + $scope.onSelectStampGroupCallback = function (item, model) { + $scope.newStampGroup = item; + }; + }]); @@ -1047,6 +1055,10 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo } }; + $scope.onSelectCustomerResponsibleCallback = function (item, model) { + $scope.newCustomerResponsible = item; + }; + // remove customer responsible $scope.removeCustomerResponsible = function(index) { if ($window.confirm("Êtes-vous sûr de vouloir supprimer ce chargé de clientèle ?")) { @@ -1231,6 +1243,14 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo } }; + $scope.onSelectRightUserCallback = function (item, model) { + $scope.newRightUser = item; + }; + + $scope.onSelectRightGroupCallback = function (item, model) { + $scope.newRightGroup = item; + }; + // change le droit de lecture du groupe $scope.changeReadRightGroup = function(group) { var index = $scope.selectedMailFolder.readRightGroups.indexOfByTopiaId(group); @@ -1694,6 +1714,11 @@ ConfigurationModule.controller('ConfigurationChefGroupController', ['$scope', '$ $scope.selectedGroupChef.managedGroups.splice(index, 1); } }; + + + $scope.onSelectManagedGroupCallback = function (item, model) { + $scope.newManagedGroup = item; + }; }]); function isLocalStorageAvailable() { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.