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 89074c51f75c50e12ffe9e907ebe6ef1ba6f15b9 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 17 14:38:06 2017 +0100 refs #9105 gestion de la conf computeQuantitiesSubtotalsByState dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 37 ++++++++++++++++------ .../src/main/webapp/js/configuration.js | 4 +++ 2 files changed, 31 insertions(+), 10 deletions(-) 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 f8ea653..fe3f5b2 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 @@ -533,36 +533,36 @@ </div> <div class="form-group"> - <label class="control-label">Permettre l'ouverture des versions non-modifiées des pièces-jointes ?</label><br /> + <label class="control-label">Forcer à prendre l'élément pour l'éditer ?</label><br /> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="true"> oui + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="true"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="false"> non + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="false"> non </label> <label class="radio-inline" ng-if="selectedMailFolder.$parent"> <input type="radio" - ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.canViewOriginalAttachments ? 'Oui' : 'Non'}}) + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.mustTakeToEditDemand ? 'Oui' : 'Non'}}) </label> </div> <div class="form-group"> - <label class="control-label">Forcer à prendre l'élément pour l'éditer ?</label><br /> + <label class="control-label">Permettre l'ouverture des versions non modifiées des pièces-jointes ?</label><br /> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="true"> oui + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="true"> oui </label> <label class="radio-inline"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="false"> non + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="false"> non </label> <label class="radio-inline" ng-if="selectedMailFolder.$parent"> <input type="radio" - ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="undefined"> hériter du dossier parent - ({{parentScopeValues.mustTakeToEditDemand ? 'Oui' : 'Non'}}) + ng-model="selectedMailFolder.canViewOriginalAttachments" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.canViewOriginalAttachments ? 'Oui' : 'Non'}}) </label> </div> @@ -583,6 +583,23 @@ </label> </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="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.computeQuantitiesSubtotalsByState" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.computeQuantitiesSubtotalsByState ? 'Oui' : 'Non'}}) + </label> + </div> + <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 8e05e58..28d8507 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -784,6 +784,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.canViewOriginalAttachments = $scope.selectedMailFolder.canViewOriginalAttachments || false; $scope.selectedMailFolder.mustTakeToEditDemand = $scope.selectedMailFolder.mustTakeToEditDemand || false; $scope.selectedMailFolder.displayHelpOnMessages = $scope.selectedMailFolder.displayHelpOnMessages || false; + $scope.selectedMailFolder.computeQuantitiesSubtotalsByState = $scope.selectedMailFolder.computeQuantitiesSubtotalsByState || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } @@ -886,6 +887,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.displayHelpOnMessages)) { $scope.parentScopeValues.displayHelpOnMessages = folder.displayHelpOnMessages; } + if (angular.isUndefined($scope.parentScopeValues.computeQuantitiesSubtotalsByState)) { + $scope.parentScopeValues.computeQuantitiesSubtotalsByState = folder.computeQuantitiesSubtotalsByState; + } 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>.