Author: echatellier Date: 2014-06-20 18:36:21 +0200 (Fri, 20 Jun 2014) New Revision: 249 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/249 Log: Gestion de la configuration pour l'adresse mail de r?\195?\169ponde et le contenu des mails de rejets 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-06-20 16:23:59 UTC (rev 248) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-06-20 16:36:21 UTC (rev 249) @@ -377,6 +377,31 @@ Définir le domaine des fax :</label> <input type="text" class="form-control" ng-model="selectedMailFolder.faxDomain" ng-if="selectedMailFolder.useCurrentLevelFaxDomain || !selectedMailFolder.$parent"> </div> + + <hr /> + + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="false" /> + Hériter de l'adresse de réponse pour les rejets :</label> + <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" /> + 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"> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMessage" ng-value="false" /> + Hériter du message de réponse pour les rejets :</label> + <textarea type="text" class="form-control" disabled + ng-model="parentScopeValues.rejectResponseMessage" ng-if="!selectedMailFolder.useCurrentLevelRejectResponseMessage"></textarea> + </div> + <div class="form-group"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMessage" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir le message de réponse pour les rejets :</label> + <textarea class="form-control" ng-model="selectedMailFolder.rejectResponseMessage" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMessage || !selectedMailFolder.$parent"></textarea> + </div> </div> </div> </div> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:23:59 UTC (rev 248) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-06-20 16:36:21 UTC (rev 249) @@ -350,7 +350,9 @@ useCurrentLevelEtatAttente: false, useCurrentLevelTableColumns: false, useCurrentLevelFaxDomain: false, - useCurrentLevelEdiFolder: false + useCurrentLevelEdiFolder: false, + useCurrentLevelRejectResponseMessage: false, + useCurrentLevelRejectResponseMailAddress: false }; // extend node (in faxtomail collapsed = extended) scope.collapse(); @@ -574,6 +576,12 @@ if (!$scope.parentScopeValues.ediFolder) { $scope.parentScopeValues.ediFolder = folder.ediFolder; } + if (angular.isUndefined($scope.parentScopeValues.rejectResponseMailAddress)) { + $scope.parentScopeValues.rejectResponseMailAddress = folder.rejectResponseMailAddress; + } + if (angular.isUndefined($scope.parentScopeValues.rejectResponseMessage)) { + $scope.parentScopeValues.rejectResponseMessage= folder.rejectResponseMessage; + } if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; }