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 bbc51afa6ae259ba4d16b622020488e42e4ab2ff Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 15:21:32 2017 +0200 mauvaise récursivité --- faxtomail-ui-web/src/main/webapp/js/configuration.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/faxtomail-ui-web/src/main/webapp/js/configuration.js b/faxtomail-ui-web/src/main/webapp/js/configuration.js index e51f027..db18730 100644 --- a/faxtomail-ui-web/src/main/webapp/js/configuration.js +++ b/faxtomail-ui-web/src/main/webapp/js/configuration.js @@ -860,6 +860,12 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo var updateParentScopeValues = function(folder) { if (folder) { + + // move to parent first to keed parent order for collection + if (folder.$parent) { + updateParentScopeValues(folder.$parent); + }; + // take current folder first before parent values (warn about 'undefined' and 'false') if (angular.isUndefined($scope.parentScopeValues.allowCreateDemandIntoFolder)) { $scope.parentScopeValues.allowCreateDemandIntoFolder = folder.allowCreateDemandIntoFolder; @@ -952,11 +958,6 @@ ConfigurationModule.controller('ConfigurationTreeController', ['$scope', '$windo $scope.parentScopeValues.invalidFormDisabledActions = folder.invalidFormDisabledActions; } - // move to parent first to keed parent order for collection - if (folder.$parent) { - updateParentScopeValues(folder.$parent); - }; - // parents values if (folder.replyAddresses) { $scope.parentScopeValues.replyAddresses = $scope.parentScopeValues.replyAddresses.concat(folder.replyAddresses); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.