branch develop updated (6b973ee -> bbc51af)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository faxtomail. See https://gitlab.nuiton.org/codelutin/faxtomail.git from 6b973ee fix typo new 511972c ajout d'un libellé new bbc51af mauvaise récursivité The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit bbc51afa6ae259ba4d16b622020488e42e4ab2ff Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 15:21:32 2017 +0200 mauvaise récursivité commit 511972c3571afca24d0b2c2bc580a99e441419a4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 15:21:17 2017 +0200 ajout d'un libellé Summary of changes: .../main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- faxtomail-ui-web/src/main/webapp/js/configuration.js | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 511972c3571afca24d0b2c2bc580a99e441419a4 Author: Kevin Morin <morin@codelutin.com> Date: Tue Apr 18 15:21:17 2017 +0200 ajout d'un libellé --- .../src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties index a20908e..1983655 100644 --- a/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties +++ b/faxtomail-ui-swing/src/main/resources/i18n/faxtomail-ui-swing_fr_FR.properties @@ -319,7 +319,7 @@ faxtomail.reply.label.to=À \: faxtomail.reply.message=<html><body><p></p>%s<p>Le %s, %s a écrit \:</p><div style\='border-left\: 2px solid blue;padding-left\: 5px;'>%s</div> faxtomail.reply.subject=Re \: %s faxtomail.reply.title=Réponse à \: %s -faxtomail.reply.titleForward= +faxtomail.reply.titleForward=Transfert à \: %s faxtomail.search.action.error=Erreur lors de la recherche faxtomail.search.action.gotoFolder=Aller au dossier faxtomail.search.action.gotoFolder.tip=Aller au dossier -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm