Author: echatellier Date: 2014-07-28 16:22:34 +0200 (Mon, 28 Jul 2014) New Revision: 447 Url: http://forge.codelutin.com/projects/faxtomail/repository/revisions/447 Log: Affichage de 'Autoriser le transfer EDI' par dossier. 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-28 14:05:34 UTC (rev 446) +++ trunk/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp 2014-07-28 14:22:34 UTC (rev 447) @@ -214,11 +214,6 @@ <input type="checkbox" ng-checked="selectedDemandType.fields.indexOf(mailField) != -1" ng-click="changeDemandTypeField(mailField)"> {{label}} </label> - <span ng-show="mailField == 'RANGE_ROW'">(<label> - <input type="checkbox" ng-model="selectedDemandType.ediTransfer" - ng-disabled="selectedDemandType.fields.indexOf(mailField) == -1"/> Autoriser le transfert EDI - <i class="fa fa-info-circle" tooltip="Si cette case est cochée, les demandes valides seront transférées à l'EDI pour le traitement des numéros de commande des gammes, sinon les demandes passerons directement dans le statut 'en cours'"></i> - </label>)</span> </div> </div> <div class="col-md-8" ng-if="!selectedDemandType"> @@ -340,23 +335,6 @@ ({{parentScopeValues.openAttachmentReportNoTaken ? 'Oui' : 'Non'}}) </label> </div> - - <div class="form-group"> - <label class="control-label">Refuser les mails dont l'email est inconnu de la base client</label><br /> - <label class="radio-inline"> - <input type="radio" - ng-model="selectedMailFolder.rejectUnknownSender" ng-value="true"> oui - </label> - <label class="radio-inline"> - <input type="radio" - ng-model="selectedMailFolder.rejectUnknownSender" ng-value="false"> non - </label> - <label class="radio-inline" ng-if="selectedMailFolder.$parent"> - <input type="radio" - ng-model="selectedMailFolder.rejectUnknownSender" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.rejectUnknownSender ? 'Oui' : 'Non'}}) - </label> - </div> <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelRejectResponseMailAddress" ng-value="false" /> @@ -385,6 +363,23 @@ <hr /> + <div class="form-group"> + <label class="control-label">Autoriser le transfert EDI ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.ediTransfer" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.ediTransfer" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.ediTransfer" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.ediTransfer ? 'Oui' : 'Non'}}) + </label> + </div> + <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelEdiFolder" ng-value="false" /> Hériter du dossier de dépôt des demandes EDI sur le serveur :</label> Modified: trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js =================================================================== --- trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-28 14:05:34 UTC (rev 446) +++ trunk/faxtomail-ui-web/src/main/webapp/js/configuration.js 2014-07-28 14:22:34 UTC (rev 447) @@ -595,6 +595,7 @@ $scope.selectedMailFolder.openAttachmentReportNoTaken = $scope.selectedMailFolder.openAttachmentReportNoTaken || false; $scope.selectedMailFolder.printActionEqualTakeAction = $scope.selectedMailFolder.printActionEqualTakeAction || false; $scope.selectedMailFolder.rejectUnknownSender = $scope.selectedMailFolder.rejectUnknownSender || false; + $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } // initialisation des valeurs du parent @@ -678,6 +679,9 @@ if (angular.isUndefined($scope.parentScopeValues.rejectUnknownSender)) { $scope.parentScopeValues.rejectUnknownSender = folder.rejectUnknownSender; } + if (angular.isUndefined($scope.parentScopeValues.ediTransfer)) { + $scope.parentScopeValues.ediTransfer = folder.ediTransfer; + } if (!$scope.parentScopeValues.faxDomain) { $scope.parentScopeValues.faxDomain = folder.faxDomain; }