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 b13b6b1e44504ca382901c22b72d6dd349552e16 Author: Kevin Morin <morin@codelutin.com> Date: Tue Mar 14 15:21:23 2017 +0100 refs #9106 modif partie admin des actions inactives de la conf générale à l'arborescence --- .../WEB-INF/content/admin/configuration-input.jsp | 57 +++++++++++++++++----- .../src/main/webapp/js/configuration.js | 43 ++++++++++------ 2 files changed, 73 insertions(+), 27 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 637a905..a08dc36 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 @@ -98,14 +98,6 @@ <input type="text" id="configurationEmailMaxSizeField" class="form-control" ng-model="configuration.emailMaxSize" fm-integer /> </div> - Actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> : - <div class="checkbox" ng-repeat="(mailAction,label) in mailActions"> - <label> - <input type="checkbox" ng-checked="configuration.invalidFormDisabledActions.indexOf(mailAction) == -1" - ng-click="changeInvalidAction(mailAction)"> {{label}} - </label> - </div> - <table class="table table-bordered"> <caption>Commande de traitement des extensions de pièces jointes</caption> <thead> @@ -1050,17 +1042,58 @@ </div> </div> - <!-- configuration des colonnes a afficher --> + <!-- Sélection des actions possibles pour ce dossier si une demande est invalide --> <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> <a data-toggle="collapse" data-parent="#accordion" href="#collapse7"> - Configuration des colonnes à afficher + Sélection des actions autorisées lorsque la demande n'a pas d'état d'attente et est <strong>invalide</strong> </a> </h4> </div> <div id="collapse7" class="panel-collapse collapse"> <div class="panel-body"> + <div> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions" + ng-value="false" ng-change="initFolderInvalidFormDisabledActions()" /> + Hériter des actions déclarées sur les dossiers parent : + </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions" ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelInvalidFormDisabledActions"> + <label> + <input type="checkbox" ng-checked="parentScopeValues.invalidFormDisabledActions.indexOf(mailAction) == -1" + disabled> {{label}} + </label> + </div> + </div> + <div> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions" ng-value="true" + ng-change="initFolderInvalidFormDisabledActions()" ng-if="selectedMailFolder.$parent" /> + Définir les actions autorisées pour ce dossier : + </label> + <div class="checkbox" ng-repeat="(mailAction,label) in mailActions" ng-if="selectedMailFolder.useCurrentLevelInvalidFormDisabledActions || !selectedMailFolder.$parent"> + <label> + <input type="checkbox" ng-checked="selectedMailFolder.invalidFormDisabledActions.indexOf(mailAction) == -1" + ng-click="changeInvalidAction(mailAction)"> {{label}} + </label> + </div> + </div> + </div> + </div> + </div> + + <!-- configuration des colonnes a afficher --> + <div class="panel panel-default"> + <div class="panel-heading"> + <h4 class="panel-title"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse8"> + Configuration des colonnes à afficher + </a> + </h4> + </div> + <div id="collapse8" class="panel-collapse collapse"> + <div class="panel-body"> <label ng-if="selectedMailFolder.$parent"> <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" @@ -1118,12 +1151,12 @@ <div class="panel panel-default"> <div class="panel-heading"> <h4 class="panel-title"> - <a data-toggle="collapse" data-parent="#accordion" href="#collapse8"> + <a data-toggle="collapse" data-parent="#accordion" href="#collapse9"> Droits </a> </h4> </div> - <div id="collapse8" class="panel-collapse collapse"> + <div id="collapse9" class="panel-collapse collapse"> <div class="panel-body"> <!-- Droits d'accès --> <table id="rights" class="table table-bordered"> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 2d9642f..29e98f6 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -192,21 +192,6 @@ ConfigurationModule.controller('ConfigurationController', ['$scope', 'Configurat ConfigurationModule.controller('ConfigurationMiscController', ['$scope', '$window', 'ConfigurationData', function($scope, $window, ConfigurationData) { - // initialisation de la configuration - if (!$scope.configuration.invalidFormDisabledActions) { - $scope.configuration.invalidFormDisabledActions = []; - } - - // selection/deselection d'une action - $scope.changeInvalidAction = function(action) { - var index = $scope.configuration.invalidFormDisabledActions.indexOf(action); - if (index != -1) { - $scope.configuration.invalidFormDisabledActions.splice(index, 1); - } else { - $scope.configuration.invalidFormDisabledActions.push(action); - } - }; - // Ajout d'une nouvelle ligne vide d'extension $scope.addExtensionRow = function() { if (!$scope.configuration.extensionCommands) { @@ -922,6 +907,13 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if ((!$scope.parentScopeValues.ranges || $scope.parentScopeValues.ranges.length == 0) && folder.ranges) { $scope.parentScopeValues.ranges = folder.ranges; } + console.log($scope.parentScopeValues.invalidFormDisabledActions) + if ($scope.parentScopeValues.invalidFormDisabledActions) + console.log($scope.parentScopeValues.invalidFormDisabledActions.length == 0) + console.log(folder.invalidFormDisabledActions) + if ((!$scope.parentScopeValues.invalidFormDisabledActions || $scope.parentScopeValues.invalidFormDisabledActions.length == 0) && folder.invalidFormDisabledActions) { + $scope.parentScopeValues.invalidFormDisabledActions = folder.invalidFormDisabledActions; + } // move to parent first to keed parent order for collection if (folder.$parent) { @@ -1181,6 +1173,27 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo } }; + // initialise la liste des actions avec celle des niveaux supérieurs + $scope.initFolderInvalidFormDisabledActions = function() { + if ($scope.selectedMailFolder.useCurrentLevelInvalidFormDisabledActions) { + if ($scope.parentScopeValues.invalidFormDisabledActions) { + $scope.selectedMailFolder.invalidFormDisabledActions = $scope.parentScopeValues.invalidFormDisabledActions.slice(); // soft copy + } + } else { + delete $scope.selectedMailFolder.invalidFormDisabledActions; + } + }; + + // selection/deselection d'une action + $scope.changeInvalidAction = function(action) { + var index = $scope.selectedMailFolder.invalidFormDisabledActions.indexOf(action); + if (index != -1) { + $scope.selectedMailFolder.invalidFormDisabledActions.splice(index, 1); + } else { + $scope.selectedMailFolder.invalidFormDisabledActions.push(action); + } + }; + // initialise la liste des colonnes sélectionnées avec celle des niveaux supérieurs $scope.initFolderColumns = function() { if ($scope.selectedMailFolder.useCurrentLevelTableColumns) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.