This is an automated email from the git hooks/post-receive script. New commit to branch feature/9096_print_only_one_content in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 8e7e3b09e66516aca790e4e371999acd124cfca1 Author: Kevin Morin <morin@codelutin.com> Date: Mon Apr 3 16:50:25 2017 +0200 refs #9096 #9100 #9104 ajout des configurations dans l'admin --- .../WEB-INF/content/admin/configuration-input.jsp | 51 ++++++++++++++++++++++ .../src/main/webapp/js/configuration.js | 9 ++++ 2 files changed, 60 insertions(+) diff --git a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp index f4127e0..243f845 100644 --- a/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp +++ b/faxtomail-ui-web/src/main/webapp/WEB-INF/content/admin/configuration-input.jsp @@ -480,6 +480,23 @@ ({{parentScopeValues.printActionEqualTakeOnlyIfNotTaken ? 'Oui' : 'Non'}}) </label> </div> + + <div class="form-group"> + <label class="control-label">Par défaut, imprimer aussi les images incluses dans le mail séparément ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.printInlineAttachments" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.printInlineAttachments" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.printInlineAttachments" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.printInlineAttachments ? 'Oui' : 'Non'}}) + </label> + </div> <div class="form-group"> <label class="control-label">Colorer les demandes invalides dans la listes ?</label><br /> @@ -567,6 +584,40 @@ </div> <div class="form-group"> + <label class="control-label">Afficher les aperçus des pièces jointes à la suite du mail ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showAttachmentPreview" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showAttachmentPreview" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.showAttachmentPreview" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.showAttachmentPreview ? 'Oui' : 'Non'}}) + </label> + </div> + + <div class="form-group"> + <label class="control-label">Regrouper la pièce-jointe de contenu du mail dans la partie "Divers" ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.mailContentWithInlineAttachments" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.mailContentWithInlineAttachments" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.mailContentWithInlineAttachments" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.mailContentWithInlineAttachments ? 'Oui' : 'Non'}}) + </label> + </div> + + <div class="form-group"> <label class="control-label">Afficher l'aide sur le message à la fermeture d'un élément non enregistré ?</label><br /> <label class="radio-inline"> <input type="radio" diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index c603c50..e51f027 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -879,12 +879,21 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.printActionEqualTakeOnlyIfNotTaken)) { $scope.parentScopeValues.printActionEqualTakeOnlyIfNotTaken = folder.printActionEqualTakeOnlyIfNotTaken; } + if (angular.isUndefined($scope.parentScopeValues.printInlineAttachments)) { + $scope.parentScopeValues.printInlineAttachments = folder.printInlineAttachments; + } if (angular.isUndefined($scope.parentScopeValues.lockedDemandsOpenableInReadOnly)) { $scope.parentScopeValues.lockedDemandsOpenableInReadOnly = folder.lockedDemandsOpenableInReadOnly; } if (angular.isUndefined($scope.parentScopeValues.canViewOriginalAttachments)) { $scope.parentScopeValues.canViewOriginalAttachments = folder.canViewOriginalAttachments; } + if (angular.isUndefined($scope.parentScopeValues.mailContentWithInlineAttachments)) { + $scope.parentScopeValues.mailContentWithInlineAttachments = folder.mailContentWithInlineAttachments; + } + if (angular.isUndefined($scope.parentScopeValues.showAttachmentPreview)) { + $scope.parentScopeValues.showAttachmentPreview = folder.showAttachmentPreview; + } if (angular.isUndefined($scope.parentScopeValues.mustTakeToEditDemand)) { $scope.parentScopeValues.mustTakeToEditDemand = folder.mustTakeToEditDemand; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.