This is an automated email from the git hooks/post-receive script. New commit to branch feature/9094_always_open_demand_in_edition in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit a026aa098fc91302fcea4c8de0a14880711de1e3 Author: Kevin Morin <morin@codelutin.com> Date: Thu Mar 16 11:55:22 2017 +0100 refs #9094 gestion de la conf mustTakeToEditDemand dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 17 +++++++++++++++++ faxtomail-ui-web/src/main/webapp/js/configuration.js | 4 ++++ 2 files changed, 21 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 0255c2c..8baa452 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 @@ -549,6 +549,23 @@ </label> </div> + <div class="form-group"> + <label class="control-label">Forcer à prendre l'élément pour l'éditer ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.mustTakeToEditDemand" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.mustTakeToEditDemand" 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'}}) + </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 d6610ec..9eaaefc 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -782,6 +782,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken = $scope.selectedMailFolder.printActionEqualTakeOnlyIfNotTaken || false; $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly = $scope.selectedMailFolder.lockedDemandsOpenableInReadOnly || false; $scope.selectedMailFolder.canViewOriginalAttachments = $scope.selectedMailFolder.canViewOriginalAttachments || false; + $scope.selectedMailFolder.mustTakeToEditDemand = $scope.selectedMailFolder.mustTakeToEditDemand || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; } @@ -878,6 +879,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.canViewOriginalAttachments)) { $scope.parentScopeValues.canViewOriginalAttachments = folder.canViewOriginalAttachments; } + if (angular.isUndefined($scope.parentScopeValues.mustTakeToEditDemand)) { + $scope.parentScopeValues.mustTakeToEditDemand = folder.mustTakeToEditDemand; + } 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>.