Author: echatellier Date: 2014-07-02 16:22:51 +0200 (Wed, 02 Jul 2014) New Revision: 318 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/318 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 14:16:13 UTC (rev 317) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 14:22:51 UTC (rev 318) @@ -109,9 +109,7 @@ <tbody> <tr ng-repeat="extensionCommand in configuration.extensionCommands"> <td class="col-xs-2"> - <div class="form-group"> - <input type="text" class="form-control" ng-model="extensionCommand.extension" size="5" placeholder="jpg" required> - </div> + {{extensionCommand.extension}} <a class="pull-right btn btn-danger btn-xs " ng-click="deleteExtensionRow($index)" title="Supprimer l'extension"> <span class="glyphicon glyphicon-remove"></span></a> </td> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 14:16:13 UTC (rev 317) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 14:22:51 UTC (rev 318) @@ -169,7 +169,19 @@ if (!$scope.configuration.extensionCommands) { $scope.configuration.extensionCommands = []; } - $scope.configuration.extensionCommands.push({}); + var extensionName = $window.prompt("Nouvelle extension"); + + if (extensionName) { + extensionName = extensionName.toLowerCase(); + var extension = {extension : extensionName}; + + // check if already exists + if ($scope.configuration.extensionCommands.indexOfBy('extension', extension) != -1) { + $window.alert("Cette extension existe déjà !"); + } else { + $scope.configuration.extensionCommands.push(extension); + } + } }; // suppression d'un ligne