July 2014 - Faxtomail-commits - mailman.cloud.codelutin.com

r326 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 17:53:40 +0200 (Wed, 02 Jul 2014) New Revision: 326 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/326 Log: Restore current tab using jquery Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 15:29:26 UTC (rev 325) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 15:53:40 UTC (rev 326) @@ -1224,3 +1224,34 @@ } }; }]); + + + + +function isLocalStorageAvailable() { + var result; + try { + result = 'localStorage' in window && window['localStorage'] !== null; + } catch (e) { + // can happen with IE 11 in desktop mode + result = false; + } + return result; +} + +$(function() { + if (isLocalStorageAvailable()) { + + // save tab hash in local storage + $('a[data-toggle="tab"]').on('shown.bs.tab', function (e) { + var hash = e.target.hash; + localStorage.setItem("configuration-tab", hash); + }); + + // restore tab if present + var current = localStorage.getItem("configuration-tab"); + if (current) { + $('#tabs a[href="' + current + '"]').tab('show'); + } + } +}) \ No newline at end of file

1 0

r325 - in trunk: faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 17:29:26 +0200 (Wed, 02 Jul 2014) New Revision: 325 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/325 Log: Suppression des doublons dans le cas ou un utilisateur appartient ?\195?\160 plusieurs groups d'un chef de groupe Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java Modified: trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java =================================================================== --- trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-02 15:25:54 UTC (rev 324) +++ trunk/faxtomail-service/src/main/java/com/franciaflex/faxtomail/services/service/ConfigurationService.java 2014-07-02 15:29:26 UTC (rev 325) @@ -28,9 +28,11 @@ import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; +import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.mail.MessagingException; import javax.mail.Session; @@ -471,9 +473,9 @@ * @param user current user * @return all managed users */ - public List<FaxToMailUser> getUserManagedUsers(FaxToMailUser user) { + public Set<FaxToMailUser> getUserManagedUsers(FaxToMailUser user) { - List<FaxToMailUser> result = new ArrayList<>(); + Set<FaxToMailUser> result = new HashSet<>(); // s'il n'y a pas de group, il ne peut pas y avoir de droits if (user.getUserGroups() != null) { Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-07-02 15:25:54 UTC (rev 324) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/UserFolderAction.java 2014-07-02 15:29:26 UTC (rev 325) @@ -29,6 +29,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Set; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.logging.Log; @@ -60,7 +61,7 @@ protected List<MailFolder> mailFolders; - protected List<FaxToMailUser> users; + protected Set<FaxToMailUser> users; protected Map<String, Collection<MailFolder>> userFolders; @@ -98,7 +99,7 @@ return mailFolders; } - public List<FaxToMailUser> getUsers() { + public Set<FaxToMailUser> getUsers() { return users; }

1 0

r324 - in trunk/faxtomail-ui-web/src/main: java/com/franciaflex/faxtomail/web/action/admin webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 17:25:54 +0200 (Wed, 02 Jul 2014) New Revision: 324 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/324 Log: Affichage des erreurs et succes d'import Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp Modified: trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java =================================================================== --- trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java 2014-07-02 15:07:46 UTC (rev 323) +++ trunk/faxtomail-ui-web/src/main/java/com/franciaflex/faxtomail/web/action/admin/ImportAction.java 2014-07-02 15:25:54 UTC (rev 324) @@ -96,13 +96,15 @@ @Override @Action(results = {@Result(type = "redirectAction", params = {"actionName", "import-input"})}) - public String execute() throws Exception { - String result = super.execute(); + public String execute() throws Exception { // clientFile if (clientFile != null) { try (InputStream is = new FileInputStream(clientFile)) { referentielService.importClients(is); + getSession().addMessage("Fichier client importé avec succes"); + } catch (Exception ex) { + addActionError(ex.getMessage()); } } @@ -110,6 +112,9 @@ if (demandTypeFile != null) { try (InputStream is = new FileInputStream(demandTypeFile)) { referentielService.importDemandTypes(is); + getSession().addMessage("Fichier type de demande importé avec succes"); + } catch (Exception ex) { + addActionError(ex.getMessage()); } } @@ -117,6 +122,9 @@ if (rangeFile != null) { try (InputStream is = new FileInputStream(rangeFile)) { referentielService.importRanges(is); + getSession().addMessage("Fichier gamme importé avec succes"); + } catch (Exception ex) { + addActionError(ex.getMessage()); } } @@ -124,6 +132,9 @@ if (priorityFile != null) { try (InputStream is = new FileInputStream(priorityFile)) { referentielService.importPriorities(is); + getSession().addMessage("Fichier priorité importé avec succes"); + } catch (Exception ex) { + addActionError(ex.getMessage()); } } @@ -131,9 +142,12 @@ if (etatAttenteFile != null) { try (InputStream is = new FileInputStream(etatAttenteFile)) { referentielService.importEtatAttentes(is); + getSession().addMessage("Fichier état attente importé avec succes"); + } catch (Exception ex) { + addActionError(ex.getMessage()); } } - return result; + return hasErrors() ? super.input() : super.execute(); } } Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-02 15:07:46 UTC (rev 323) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/import-input.jsp 2014-07-02 15:25:54 UTC (rev 324) @@ -38,6 +38,9 @@ <s:form id="main_form" action="import" method="post" enctype="multipart/form-data"> + <s:actionmessage/> + <s:actionerror/> + <div class="form-group"> <label for="clientField" class="control-label">Fichier client :</label> <input type="file" id="clientField" name="clientFile" class="form-control">

1 0

r323 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 17:07:46 +0200 (Wed, 02 Jul 2014) New Revision: 323 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/323 Log: Add check Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 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 15:06:00 UTC (rev 322) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 15:07:46 UTC (rev 323) @@ -1071,7 +1071,7 @@ <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" ng-model="selectedGroupChef.userGroup" ng-options="group as group.completeName for group in groups|filter:availableNewGroupChef"> - <option value="" ng-if="!selectedGroupChef.userGroup"></option> + <option value=""></option> </select> </div> </div>

1 0

r322 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 17:06:00 +0200 (Wed, 02 Jul 2014) New Revision: 322 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/322 Log: Filtrage de la liste des chefs de groupes 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:43:21 UTC (rev 321) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 15:06:00 UTC (rev 322) @@ -858,7 +858,7 @@ <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|filter:filterByAlreadyInCollection(selectedMailFolder.rightGroups)"> + ng-options="user as user.firstName + ' ' + user.lastName for user in users|filter:filterByAlreadyInCollection(selectedMailFolder.rightUsers)"> </select> <a class="btn btn-success btn-xs" ng-click="addRightUser()" ng-disabled="!newRightUser"> <span class="glyphicon glyphicon-plus"></span> @@ -871,7 +871,7 @@ <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|filter:filterByAlreadyInCollection(selectedMailFolder.rightUsers)"> + ng-options="group as group.completeName for group in groups|filter:filterByAlreadyInCollection(selectedMailFolder.rightGroups)"> </select> <a class="btn btn-success btn-xs" ng-click="addRightGroup()" ng-disabled="!newRightGroup"> <span class="glyphicon glyphicon-plus"></span> @@ -1070,7 +1070,7 @@ <label for="groupChefUserGroupField" class="control-label">Chef du groupe : </label> <select id="groupChefUserGroupField" class="form-control" ng-required="selectedGroupChef" ng-model="selectedGroupChef.userGroup" - ng-options="group as group.completeName for group in groups"> + ng-options="group as group.completeName for group in groups|filter:availableNewGroupChef"> <option value="" ng-if="!selectedGroupChef.userGroup"></option> </select> </div> 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:43:21 UTC (rev 321) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 15:06:00 UTC (rev 322) @@ -1169,6 +1169,24 @@ }); }); + // filtre pour retourner seulement les groupes pouvant être chef (pas déjà utilisé) + $scope.availableNewGroupChef = function(item) { + // si c'est le groupe sélectionné, on l'autorise + var result = + $scope.selectedGroupChef && $scope.selectedGroupChef.userGroup && + $scope.selectedGroupChef.userGroup.topiaId == item.topiaId; + // sinon on refuse les groupes utilisé par d'autre chef + if (!result) { + result = true; + angular.forEach($scope.configuration.chefs, function(group) { + if (group.userGroup && group.userGroup.topiaId == item.topiaId) { + result = false; + } + }); + } + return result; + }; + // ajout d'un nouveau chef de groupe $scope.newGroupChef = function() { var groupChef = {

1 0

r321 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 16:43:21 +0200 (Wed, 02 Jul 2014) New Revision: 321 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/321 Log: Add check Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 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:38:23 UTC (rev 320) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 14:43:21 UTC (rev 321) @@ -840,6 +840,8 @@ // check if already exists if ($scope.selectedMailFolder.replyDomains.indexOf($scope.newReplyDomain) != -1) { $window.alert("Ce domaine existe déjà !"); + } else if ($scope.newReplyDomain.indexOf("@") != -1) { + $window.alert("Le nom de domaine ne doit pas contenir le symbole @ !"); } else { $scope.selectedMailFolder.replyDomains.push($scope.newReplyDomain); delete $scope.newReplyDomain;

1 0

r320 - trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 16:38:23 +0200 (Wed, 02 Jul 2014) New Revision: 320 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/320 Log: Ajout d'un check pour l'adresse email. Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 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:32:06 UTC (rev 319) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 14:38:23 UTC (rev 320) @@ -268,7 +268,7 @@ </a> </h4> </div> - <div id="collapse0" class="panel-collapse collapse in"> + <div id="collapse0" class="panel-collapse collapse in" ng-form="generalForm"> <div class="panel-body"> <div class="form-group"> <label class="control-label">Autoriser le déplacement de demandes vers ce dossier ?</label><br /> @@ -359,10 +359,12 @@ <input type="text" class="form-control" disabled ng-model="parentScopeValues.rejectResponseMailAddress" ng-if="!selectedMailFolder.useCurrentLevelRejectResponseMailAddress"> </div> - <div class="form-group"> - <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="true" ng-if="selectedMailFolder.$parent" /> + <div class="form-group" ng-class="{'has-error': generalForm.rejectResponseMailAddress.$dirty && generalForm.rejectResponseMailAddress.$invalid, + 'has-success': generalForm.rejectResponseMailAddress.$dirty && generalForm.rejectResponseMailAddress.$valid}"> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="true" ng-if="selectedMailFolder.$parent" /> Définir l'adresse de réponse pour les rejets :</label> - <input type="text" class="form-control" ng-model="selectedMailFolder.rejectResponseMailAddress" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMailAddress || !selectedMailFolder.$parent"> + <input name="rejectResponseMailAddress" type="email" class="form-control" ng-model="selectedMailFolder.rejectResponseMailAddress" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMailAddress || !selectedMailFolder.$parent"> </div> <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMessage" ng-value="false" />

1 0

r319 - trunk/faxtomail-ui-web/src/main/webapp/js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 16:32:06 +0200 (Wed, 02 Jul 2014) New Revision: 319 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/319 Log: Suppression de la partie edition Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 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:22:51 UTC (rev 318) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-02 14:32:06 UTC (rev 319) @@ -479,6 +479,11 @@ $scope.mailFilters.splice(index, 1); } + // suppression de la zone d'edition (si necessaire) + if ($scope.selectedMailFolder == nodeData) { + delete $scope.selectedMailFolder; + } + // remove current folder if (nodeData.archiveFolder) { nodeData.$parent.hasArchiveFolder = false;

1 0

r318 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

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

1 0

r317 - in trunk/faxtomail-ui-web/src/main/webapp: WEB-INF/content/admin css js
by echatellier＠users.forge.codelutin.com July 2, 2014

July 2, 2014

Author: echatellier Date: 2014-07-02 16:16:13 +0200 (Wed, 02 Jul 2014) New Revision: 317 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/317 Log: Ajout d'un check sur la taille des emails Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.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:04:24 UTC (rev 316) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-02 14:16:13 UTC (rev 317) @@ -87,7 +87,7 @@  <div class="form-group"> <label class="control-label" for="configurationEmailMaxSizeField">Taille maximale des email (en octets)</label> - <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" /> + <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" fm-integer /> </div> Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : Modified: trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-07-02 14:04:24 UTC (rev 316) +++ trunk/faxtomail-ui-web/src/main/webapp/css/faxtomail.css 2014-07-02 14:16:13 UTC (rev 317) @@ -22,6 +22,10 @@ * #L% */ +input.ng-dirty.ng-invalid { + background-color: #FA787E !important; +} + .full-width { width: 100%; } Modified: trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-07-02 14:04:24 UTC (rev 316) +++ trunk/faxtomail-ui-web/src/main/webapp/js/faxtomail.js 2014-07-02 14:16:13 UTC (rev 317) @@ -67,3 +67,28 @@ /** Mail faxtomail application module. */ var FaxToMailModule = angular.module('FaxToMail', ['ui.bootstrap']); + +/** + * Directive de validation d'un champ en entier. + */ +FaxToMailModule.directive('fmInteger', function() { + return { + require: 'ngModel', + link: function(scope, elm, attrs, ctrl) { + ctrl.$parsers.unshift(function(viewValue) { + if (/^\d+$/.test(viewValue)) { + // it is valid + ctrl.$setValidity('integer', true); + return viewValue; + } else if (viewValue.length == 0) { + ctrl.$setValidity('integer', true); + return undefined; + } else { + // it is invalid, return undefined (no model update) + ctrl.$setValidity('integer', false); + return undefined; + } + }); + } + }; +}); \ No newline at end of file

1 0