This is an automated email from the git hooks/post-receive script. New commit to branch feature/9098_user_trigraph_in_table in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 8b1fffe06386d09af0f1e9dfeaeb147ab1ed2a92 Author: Kevin Morin <morin@codelutin.com> Date: Wed Mar 15 11:11:15 2017 +0100 refs #9098 gestion de la conf displayOnlyUserTrigraphInTables dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 101 ++++++++++++--------- .../src/main/webapp/js/configuration.js | 10 +- 2 files changed, 64 insertions(+), 47 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 fe3f5b2..bb07e73 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 @@ -1162,54 +1162,71 @@ </div> <div id="collapse8" class="panel-collapse collapse"> <div class="panel-body"> + <div class="form-group"> + <label ng-if="selectedMailFolder.$parent"> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" + ng-value="false" ng-change="initFolderColumns()" /> + Hériter des colonnes déclarées sur les dossiers parent : + </label> - <label ng-if="selectedMailFolder.$parent"> - <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" - ng-value="false" ng-change="initFolderColumns()" /> - Hériter des colonnes déclarées sur les dossiers parent : - </label> + <div class="control-group" ng-show="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="parentFolderTableColumns" + simple-query="getObjectsData" multiple sortable disabled> + </div> + </div> - <div class="control-group" ng-show="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> - <div class="controls"> - <input type="hidden" ui-select2-sortable ng-model="parentFolderTableColumns" - simple-query="getObjectsData" multiple sortable disabled> + <div ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="mailField in parentFolderTableColumns">{{tableMailFields[mailField.id]}}</th> + </tr> + </thead> + </table> </div> - </div> - <div ng-if="selectedMailFolder.$parent && !selectedMailFolder.useCurrentLevelTableColumns"> - <table id='table-snapshot' class="table table-bordered"> - <caption>Aperçu</caption> - <thead> - <tr> - <th ng-repeat="mailField in parentFolderTableColumns">{{tableMailFields[mailField.id]}}</th> - </tr> - </thead> - </table> - </div> - - <label> - <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" - ng-change="initFolderColumns()" ng-if="selectedMailFolder.$parent" /> - Définir les colonnes à afficher pour ce dossier : - </label> - - <div class="control-group" ng-show="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> - <div class="controls"> - <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" - simple-query="getObjectsData" multiple sortable> - <p class="help-block">(l'ordre peut être changé en faisant un glisser/déposer sur les champs)</p> + <label> + <input type="radio" ng-model="selectedMailFolder.useCurrentLevelTableColumns" ng-value="true" + ng-change="initFolderColumns()" ng-if="selectedMailFolder.$parent" /> + Définir les colonnes à afficher pour ce dossier : + </label> + + <div class="control-group" ng-show="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> + <div class="controls"> + <input type="hidden" ui-select2-sortable ng-model="folderTableColumns" + simple-query="getObjectsData" multiple sortable> + <p class="help-block">(l'ordre peut être changé en faisant un glisser/déposer sur les champs)</p> + </div> </div> - </div> - <div ng-if="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> - <table id='table-snapshot' class="table table-bordered"> - <caption>Aperçu</caption> - <thead> - <tr> - <th ng-repeat="mailField in folderTableColumns">{{tableMailFields[mailField.id]}}</th> - </tr> - </thead> - </table> + <div ng-if="!selectedMailFolder.$parent || selectedMailFolder.useCurrentLevelTableColumns"> + <table id='table-snapshot' class="table table-bordered"> + <caption>Aperçu</caption> + <thead> + <tr> + <th ng-repeat="mailField in folderTableColumns">{{tableMailFields[mailField.id]}}</th> + </tr> + </thead> + </table> + </div> + </div> + <div class="form-group"> + <label class="control-label">N'afficher que les trigrammes dans les colonnes utilisateurs ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.displayOnlyUserTrigraphInTables" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.displayOnlyUserTrigraphInTables ? 'Oui' : 'Non'}}) + </label> </div> </div> </div> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index 28d8507..c9b9309 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -785,7 +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.ediTransfer = $scope.selectedMailFolder.ediTransfer|| false; + $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; + $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; } // initialisation des valeurs du parent @@ -914,6 +915,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if ((!$scope.parentScopeValues.folderTableColumns || $scope.parentScopeValues.folderTableColumns.length == 0) && folder.folderTableColumns) { $scope.parentScopeValues.folderTableColumns = folder.folderTableColumns; } + if (angular.isUndefined($scope.parentScopeValues.displayOnlyUserTrigraphInTables)) { + $scope.parentScopeValues.displayOnlyUserTrigraphInTables = folder.displayOnlyUserTrigraphInTables; + } if ((!$scope.parentScopeValues.waitingStates || $scope.parentScopeValues.waitingStates.length == 0) && folder.waitingStates) { $scope.parentScopeValues.waitingStates = folder.waitingStates; } @@ -923,10 +927,6 @@ 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; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.