branch develop updated (caa5edd -> e5403cf)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from caa5edd Corrige la création d'une activité de fin de veille lors de la cloture de la route new e5403cf Corrige la recuperation du noeud des activités suite au refactoring des chaines i18n The 1 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 e5403cf9894bb100a677ce206a1f2a9cc372309c Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 6 18:38:03 2016 +0200 Corrige la recuperation du noeud des activités suite au refactoring des chaines i18n Summary of changes: .../application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../swing/ui/tree/actions/ChangeActivityRouteActionListener.java | 2 +- 2 files changed, 2 insertions(+), 2 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit e5403cf9894bb100a677ce206a1f2a9cc372309c Author: Samuel Maisonneuve <maisonneuve@codelutin.com> Date: Tue Sep 6 18:38:03 2016 +0200 Corrige la recuperation du noeud des activités suite au refactoring des chaines i18n --- .../application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java | 2 +- .../swing/ui/tree/actions/ChangeActivityRouteActionListener.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java index aa29939..0aceb91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/shared/MoveActivitySeinesUIAction.java @@ -165,7 +165,7 @@ public class MoveActivitySeinesUIAction extends AbstractUIAction { ObserveNode routesNode = oldRouteNode.getParent(); ObserveNode tripNode = routesNode.getParent(); ObserveNode newRouteNode = treeHelper.getChild(routesNode, routeId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivitySeineDto.class); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); ObserveNode newActivitiesNode = treeHelper.getChild(newRouteNode, activitiesNodeId); // Let's check if we're moving an open activity diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java index 2c18fbf..f7d103e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/actions/ChangeActivityRouteActionListener.java @@ -70,7 +70,7 @@ public class ChangeActivityRouteActionListener extends NodeChangeActionListener @Override protected ObserveNode getNewParentNode(ObserveNode grandParentNode, String parentNodeId) { ObserveNode routeNode = getTreeHelper().getChild(grandParentNode, parentNodeId); - String activitiesNodeId = ObserveI18nDecoratorHelper.getTypeI18nKey(ActivitySeineDto.class); + String activitiesNodeId = ObserveI18nDecoratorHelper.getTypePluralI18nKey(ActivitySeineDto.class); return getTreeHelper().getChild(routeNode, activitiesNodeId); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm