Author: echatellier Date: 2014-06-05 15:48:35 +0200 (Thu, 05 Jun 2014) New Revision: 136 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/136 Log: refs #4662: Ajout des domaines de r?\195?\169ponse Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo 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/user-folder-input.jsp trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js Modified: trunk/faxtomail-persistence/src/main/xmi/faxtomail.zargo =================================================================== (Binary files differ) 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-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-05 13:48:35 UTC (rev 136) @@ -248,7 +248,7 @@ <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse0"> - Liste des chargés de clientèle + Généralité </a> </h4> </div> @@ -414,13 +414,65 @@ </a> </td> </tr> + <tr ng-if="!selectedMailFolder.replyAddresses || selectedMailFolder.replyAddresses.length == 0"> + <td colspan="2" class="emptyTable">Aucune adresse définie</td> + </tr> </tbody> </table> - Nouveau : <input type="email" ng-model="newReplyAddress" placeholder="nom.prenom@franciaflex.fr" /> - <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> - <span class="glyphicon glyphicon-ok"></span> - </a> + <div class="form-inline" ng-form="addAddressForm" role="form"> + <div class="form-group has-feedback" + ng-class="{'has-error': addAddressForm.address.$dirty && addAddressForm.address.$invalid, + 'has-success': addAddressForm.address.$dirty && addAddressForm.address.$valid}"> + <label for="newAddressField" class="control-label">Nouvelle adresse : </label> + <input id="newAddressField" class="form-control" name="address" type="email" ng-model="newReplyAddress" placeholder="nom.prenom@franciaflex.fr" /> + <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$valid"></span> + <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addAddressForm.address.$dirty && addAddressForm.address.$invalid"></span> + </div> + <a class="btn btn-success btn-xs" ng-click="addReplyAddress()" ng-disabled="!newReplyAddress"> + <span class="glyphicon glyphicon-ok"></span> + </a> + </div> + + <br /> + + <table class="table table-bordered"> + <thead> + <tr> + <th>Nom de domaine</th> + <th>Action</th> + </tr> + </thead> + <tbody> + <tr ng-repeat="replyDomain in selectedMailFolder.replyDomains track by $index"> + <td> + <span class="glyphicon glyphicon-globe"></span> + {{replyDomain}}</td> + <td> + <a class="pull-right btn btn-danger btn-xs" ng-click="removeReplyDomain($index)"> + <span class="glyphicon glyphicon-remove"></span> + </a> + </td> + </tr> + <tr ng-if="!selectedMailFolder.replyDomains || selectedMailFolder.replyDomains.length == 0"> + <td colspan="2" class="emptyTable">Aucune domaine défini</td> + </tr> + </tbody> + </table> + + <div class="form-inline" ng-form="addDomainForm" role="form"> + <div class="form-group has-feedback" + ng-class="{'has-error': addDomainForm.domain.$dirty && addDomainForm.domain.$invalid, + 'has-success': addDomainForm.domain.$dirty && addDomainForm.domain.$valid}"> + <label for="newDomainField" class="control-label">Nouveau domaine : </label> + <input id="newDomainField" class="form-control" type="text" name="domain" ng-model="newReplyDomain" placeholder="franciaflex.fr" /> + <span class="glyphicon glyphicon-ok form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$valid"></span> + <span class="glyphicon glyphicon-remove form-control-feedback" ng-if="addDomainForm.domain.$dirty && addDomainForm.domain.$invalid"></span> + </div> + <a class="btn btn-success btn-xs" ng-click="addReplyDomain()" ng-disabled="!newReplyDomain"> + <span class="glyphicon glyphicon-ok"></span> + </a> + </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/user-folder-input.jsp 2014-06-05 13:48:35 UTC (rev 136) @@ -35,6 +35,7 @@ <script type="text/javascript" src="<s:url value='/webjars/angularjs/1.2.16/angular.min.js' />"></script> <script type="text/javascript" src="<s:url value='/js/select2sortable.js' />"></script> <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap.min.js' />"></script> + <script type="text/javascript" src="<s:url value='/webjars/angular-ui-bootstrap/0.11.0/ui-bootstrap-tpls.min.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/css/faxtomail.css' />" /> <script type="text/javascript" src="<s:url value='/js/faxtomail.js' />"></script> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 12:42:57 UTC (rev 135) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-05 13:48:35 UTC (rev 136) @@ -234,6 +234,8 @@ $scope.newCustomerResponsible; // {String} add new customer responsible form value $scope.newReplyAddress; + // {String} add new domain form value + $scope.newReplyDomain; // {Array} Colonnes selectionnées pour le dossier courant $scope.folderTableColumns; @@ -286,9 +288,12 @@ if (!$scope.selectedMailFolder.replyAddresses) { $scope.selectedMailFolder.replyAddresses = []; } - if (!$scope.selectedMailFolder.contextActions) { - $scope.selectedMailFolder.contextActions = []; + if (!$scope.selectedMailFolder.replyDomains) { + $scope.selectedMailFolder.replyDomains = []; } + if (!$scope.selectedMailFolder.folderActions) { + $scope.selectedMailFolder.folderActions = []; + } if (!$scope.selectedMailFolder.folderTableColumns) { $scope.selectedMailFolder.folderTableColumns = []; } @@ -343,13 +348,26 @@ $scope.addReplyAddress = function() { $scope.selectedMailFolder.replyAddresses.push($scope.newReplyAddress); delete $scope.newReplyAddress; + $scope.addAddressForm.$setPristine(); }; // remove customer responsible $scope.removeReplyAddress = function(index) { $scope.selectedMailFolder.replyAddresses.splice(index, 1); }; + + // add reply domain + $scope.addReplyDomain = function() { + $scope.selectedMailFolder.replyDomains.push($scope.newReplyDomain); + delete $scope.newReplyDomain; + $scope.addDomainForm.$setPristine(); + }; + // remove customer responsible + $scope.removeReplyDomain = function(index) { + $scope.selectedMailFolder.replyDomains.splice(index, 1); + }; + // add reply address $scope.addWriteRightUser = function() { $scope.selectedMailFolder.writeRightUsers.push($scope.newWriteRightUser);