This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 27d6a5aaa1d782b41b2f6742ebcf359bc87553ef Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 30 11:08:19 2017 +0200 refs #9103 gestion de la conf de répondre et transférer dans la partie admin --- .../faxtomail/persistence/entities/MailAction.java | 1 + .../i18n/faxtomail-ui-web_fr_FR.properties | 1 + .../WEB-INF/content/admin/configuration-input.jsp | 39 +++++++++++++++++++++- .../src/main/webapp/js/configuration.js | 8 +++++ 4 files changed, 48 insertions(+), 1 deletion(-) diff --git a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java index cb68e59..a6bfc54 100644 --- a/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java +++ b/faxtomail-persistence/src/main/java/com/franciaflex/faxtomail/persistence/entities/MailAction.java @@ -33,5 +33,6 @@ public enum MailAction { PRINT, ARCHIVE, REPLY, + FORWARD, GROUP } diff --git a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties index 8c4b9d5..a603050 100644 --- a/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties +++ b/faxtomail-ui-web/src/main/resources/i18n/faxtomail-ui-web_fr_FR.properties @@ -1,6 +1,7 @@ com.franciaflex.faxtomail.persistence.entities.FolderAction.COMPUTE_RANGE=Calculer les quantités par gamme com.franciaflex.faxtomail.persistence.entities.FolderAction.NEW_DEMANDE=Créer une nouvelle demande com.franciaflex.faxtomail.persistence.entities.MailAction.ARCHIVE=Archiver +com.franciaflex.faxtomail.persistence.entities.MailAction.FORWARD=Transférer com.franciaflex.faxtomail.persistence.entities.MailAction.GROUP=Grouper com.franciaflex.faxtomail.persistence.entities.MailAction.PRINT=Imprimer com.franciaflex.faxtomail.persistence.entities.MailAction.REPLY=Repondre 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 bb07e73..e25d755 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 @@ -584,7 +584,7 @@ </div> <div class="form-group"> - <label class="control-label">Afficher les les sous-totaux par état dans la fenêtre de calcul des quantités par gamme ?</label><br /> + <label class="control-label">Afficher les sous-totaux par état dans la fenêtre de calcul des quantités par gamme ?</label><br /> <label class="radio-inline"> <input type="radio" ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="true"> oui @@ -600,6 +600,43 @@ </label> </div> + <hr /> + + <div class="form-group"> + <label class="control-label">Activer la fonction "Répondre" sur les éléments ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showReplyAction" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showReplyAction" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.showReplyAction" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.showReplyAction ? 'Oui' : 'Non'}}) + </label> + </div> + <div class="form-group"> + <label class="control-label">Afficher la fonction "Transférer" sur les éléments ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showForwardAction" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.showForwardAction" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.showForwardAction" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.showForwardAction ? 'Oui' : 'Non'}}) + </label> + </div> + + <hr /> + <div class="form-group" ng-if="selectedMailFolder.$parent"> <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelNbElementToDisplay" ng-value="false" /> Hériter du nombre d'éléments à afficher à l'utilisateur :</label> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index c9b9309..4d894e5 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -785,6 +785,8 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.mustTakeToEditDemand = $scope.selectedMailFolder.mustTakeToEditDemand || false; $scope.selectedMailFolder.displayHelpOnMessages = $scope.selectedMailFolder.displayHelpOnMessages || false; $scope.selectedMailFolder.computeQuantitiesSubtotalsByState = $scope.selectedMailFolder.computeQuantitiesSubtotalsByState || false; + $scope.selectedMailFolder.showReplyAction = $scope.selectedMailFolder.showReplyAction || false; + $scope.selectedMailFolder.showForwardAction = $scope.selectedMailFolder.showForwardAction || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; } @@ -891,6 +893,12 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.computeQuantitiesSubtotalsByState)) { $scope.parentScopeValues.computeQuantitiesSubtotalsByState = folder.computeQuantitiesSubtotalsByState; } + if (angular.isUndefined($scope.parentScopeValues.showReplyAction)) { + $scope.parentScopeValues.showReplyAction = folder.showReplyAction; + } + if (angular.isUndefined($scope.parentScopeValues.showForwardAction)) { + $scope.parentScopeValues.showForwardAction = folder.showForwardAction; + } if (angular.isUndefined($scope.parentScopeValues.ediTransfer)) { $scope.parentScopeValues.ediTransfer = folder.ediTransfer; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.