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 859dfcd877ebe0cd03551a117107fe96d4013323 Author: Kevin Morin <morin@codelutin.com> Date: Mon Jan 9 10:21:38 2017 +0100 refs #8916 ajout de la configuration de dossier pour figer le nombre d'éléments par page --- .../WEB-INF/content/admin/configuration-input.jsp | 29 ++++++++++++++++++++++ .../src/main/webapp/js/configuration.js | 6 +++++ 2 files changed, 35 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 f54f55e..fc46124 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 @@ -507,6 +507,35 @@ <textarea class="form-control" ng-model="selectedMailFolder.rejectResponseMessage" ng-if="selectedMailFolder.useCurrentLevelRejectResponseMessage || !selectedMailFolder.$parent"></textarea> </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> + <select class="form-control" disabled + ng-model="parentScopeValues.nbElementToDisplay" + ng-if="!selectedMailFolder.useCurrentLevelNbElementToDisplay"> + <option value="">Laisser le choix à l'utilisateur</option> + <option value="50">50</option> + <option value="100">100</option> + <option value="150">150</option> + <option value="200">200</option> + <option value="250">250</option> + </select> + </div> + <div class="form-group"> + <label><input type="radio" ng-model="selectedMailFolder.useCurrentLevelNbElementToDisplay" ng-value="true" ng-if="selectedMailFolder.$parent" /> + Définir le nombre d'éléments à afficher à l'utilisateur :</label> + <select class="form-control" + ng-model="selectedMailFolder.nbElementToDisplay" + ng-if="selectedMailFolder.useCurrentLevelNbElementToDisplay || !selectedMailFolder.$parent"> + <option value="">Laisser le choix à l'utilisateur</option> + <option value="50">50</option> + <option value="100">100</option> + <option value="150">150</option> + <option value="200">200</option> + <option value="250">250</option> + </select> + </div> + <hr /> <div class="form-group"> diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index c21df34..31a2097 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -509,6 +509,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo useCurrentLevelRejectResponseMessage: true, useCurrentLevelRejectResponseMailAddress: true, useCurrentLevelCompany: true, + useCurrentLevelNbElementToDisplay: true, archiveFolder: false }; @@ -542,6 +543,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo useCurrentLevelRejectResponseMessage: false, useCurrentLevelRejectResponseMailAddress: false, useCurrentLevelCompany: false, + useCurrentLevelNbElementToDisplay: false, archiveFolder: false }; @@ -578,6 +580,7 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo useCurrentLevelRejectResponseMessage: false, useCurrentLevelRejectResponseMailAddress: false, useCurrentLevelCompany: false, + useCurrentLevelNbElementToDisplay: false, useCurrentLevelDemandType: false, useCurrentLevelRange: false, archiveFolder: true @@ -838,6 +841,9 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo if (angular.isUndefined($scope.parentScopeValues.rejectResponseMessage)) { $scope.parentScopeValues.rejectResponseMessage= folder.rejectResponseMessage; } + if (angular.isUndefined($scope.parentScopeValues.nbElementToDisplay)) { + $scope.parentScopeValues.nbElementToDisplay= folder.nbElementToDisplay; + } if (angular.isUndefined($scope.parentScopeValues.company)) { $scope.parentScopeValues.company = folder.company; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.