Author: echatellier Date: 2014-07-02 16:02:18 +0200 (Wed, 02 Jul 2014) New Revision: 315 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/315 Log: Ajout de check sur les doublons Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 13:51:52 UTC (rev 314) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 14:02:18 UTC (rev 315) @@ -857,7 +857,8 @@ <div class="form-group"> <label for="newRightUserField" class="control-label">Nouveau utilisateur :</label> <select id="newRightUserField" class="form-control" - ng-model="newRightUser" ng-options="user as user.firstName + ' ' + user.lastName for user in users"> + ng-model="newRightUser" + ng-options="user as user.firstName + ' ' + user.lastName for user in users|filter:filterByAlreadyInCollection(selectedMailFolder.rightGroups)"> </select> <a class="btn btn-success btn-xs" ng-click="addRightUser()" ng-disabled="!newRightUser"> <span class="glyphicon glyphicon-plus"></span> @@ -869,7 +870,8 @@ <div class="form-group"> <label for="newRightGroupField" class="control-label">Nouveau groupe :</label> <select id="newRightGroupField" class="form-control" - ng-model="newRightGroup" ng-options="group as group.completeName for group in groups"> + ng-model="newRightGroup" + ng-options="group as group.completeName for group in groups|filter:filterByAlreadyInCollection(selectedMailFolder.rightUsers)"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -1100,7 +1102,8 @@ <div class="form-group"> <label for="newManagedGroupField" class="control-label">Nouveau groupe :</label> <select id="newManagedGroupField" class="form-control" - ng-model="newManagedGroup" ng-options="group as group.completeName for group in groups" width="'100%'" searchContains="true"> + ng-model="newManagedGroup" width="'100%'" searchContains="true" + ng-options="group as group.completeName for group in groups|filter:filterByAlreadyInCollection(selectedGroupChef.managedGroups)" > </select> <a class="btn btn-success btn-xs" ng-click="addManagedGroup()" ng-disabled="!newManagedGroup"> <span class="glyphicon glyphicon-plus"></span> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 13:51:52 UTC (rev 314) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 14:02:18 UTC (rev 315) @@ -1012,13 +1012,18 @@ // add new filter action $scope.addNewFilter = function(rootMailFolder) { - $scope.mailFilters.push($scope.newFilter); - if (!$scope.rootFolderMailFilters.hasOwnProperty(rootMailFolder.topiaId)) { - $scope.rootFolderMailFilters[rootMailFolder.topiaId] = []; + // check if already exists + if ($scope.mailFilters.indexOfBy('expression', $scope.newFilter) != -1) { + $window.alert("Ce filtre existe déjà !"); + } else { + $scope.mailFilters.push($scope.newFilter); + if (!$scope.rootFolderMailFilters.hasOwnProperty(rootMailFolder.topiaId)) { + $scope.rootFolderMailFilters[rootMailFolder.topiaId] = []; + } + $scope.rootFolderMailFilters[rootMailFolder.topiaId].push($scope.newFilter); + // clear form + $scope.newFilter = { filterFolderPriority: false }; } - $scope.rootFolderMailFilters[rootMailFolder.topiaId].push($scope.newFilter); - // clear form - $scope.newFilter = { filterFolderPriority: false }; }; // remove filter