This is an automated email from the git hooks/post-receive script. New commit to branch feature/9099_order_on_columns in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git commit 79eca5d292aa4401bf3b97c3058efb49b1279db8 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 24 15:38:00 2017 +0100 refs #9099 gestion de la conf canChangeOrderInTable dans la partie admin --- .../WEB-INF/content/admin/configuration-input.jsp | 18 ++++++++++++++++++ faxtomail-ui-web/src/main/webapp/js/configuration.js | 4 ++++ 2 files changed, 22 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 e25d755..f4127e0 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 @@ -1249,6 +1249,7 @@ </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"> @@ -1265,6 +1266,23 @@ ({{parentScopeValues.displayOnlyUserTrigraphInTables ? 'Oui' : 'Non'}}) </label> </div> + + <div class="form-group"> + <label class="control-label">Permettre à l'utilisateur de trier selon les différentes colonnes ?</label><br /> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.canChangeOrderInTable" ng-value="true"> oui + </label> + <label class="radio-inline"> + <input type="radio" + ng-model="selectedMailFolder.canChangeOrderInTable" ng-value="false"> non + </label> + <label class="radio-inline" ng-if="selectedMailFolder.$parent"> + <input type="radio" + ng-model="selectedMailFolder.canChangeOrderInTable" ng-value="undefined"> hériter du dossier parent + ({{parentScopeValues.canChangeOrderInTable ? 'Oui' : 'Non'}}) + </label> + </div> </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 4d894e5..13b7b7a 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -789,6 +789,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.selectedMailFolder.showForwardAction = $scope.selectedMailFolder.showForwardAction || false; $scope.selectedMailFolder.ediTransfer = $scope.selectedMailFolder.ediTransfer || false; $scope.selectedMailFolder.displayOnlyUserTrigraphInTables = $scope.selectedMailFolder.displayOnlyUserTrigraphInTables || false; + $scope.selectedMailFolder.canChangeOrderInTable = $scope.selectedMailFolder.canChangeOrderInTable || false; } // initialisation des valeurs du parent @@ -926,6 +927,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.displayOnlyUserTrigraphInTables)) { $scope.parentScopeValues.displayOnlyUserTrigraphInTables = folder.displayOnlyUserTrigraphInTables; } + if (angular.isUndefined($scope.parentScopeValues.canChangeOrderInTable)) { + $scope.parentScopeValues.canChangeOrderInTable = folder.canChangeOrderInTable; + } if ((!$scope.parentScopeValues.waitingStates || $scope.parentScopeValues.waitingStates.length == 0) && folder.waitingStates) { $scope.parentScopeValues.waitingStates = folder.waitingStates; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.