branch develop-4.x updated (a06fd5b -> d560365)
This is an automated email from the git hooks/post-receive script. New change to branch develop-4.x in repository tutti. See http://git.codelutin.com/tutti.git from a06fd5b Fixes #8040 Merge branch 'feature/8040' into develop-4.x new 3532519 Retirer l'ancien code dans la décoration d'une espèce (See #7995) new d560365 Fixes #7995 Merge branch 'feature/7995' into develop-4.x 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 d560365dd70d4e0e2eb8ded10463960aab512328 Merge: a06fd5b 3532519 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 09:08:11 2016 +0100 Fixes #7995 Merge branch 'feature/7995' into develop-4.x commit 35325193f519356094c2019a9e05513aaa22de31 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 09:08:09 2016 +0100 Retirer l'ancien code dans la décoration d'une espèce (See #7995) Summary of changes: observe-business/src/main/java/fr/ird/observe/DecoratorService.java | 3 +-- .../src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java | 4 ++-- 2 files changed, 3 insertions(+), 4 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-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit 35325193f519356094c2019a9e05513aaa22de31 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 09:08:09 2016 +0100 Retirer l'ancien code dans la décoration d'une espèce (See #7995) --- observe-business/src/main/java/fr/ird/observe/DecoratorService.java | 3 +-- .../src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java index ad83c55..bdb70cf 100644 --- a/observe-business/src/main/java/fr/ird/observe/DecoratorService.java +++ b/observe-business/src/main/java/fr/ird/observe/DecoratorService.java @@ -519,9 +519,8 @@ public class DecoratorService extends DecoratorProvider { // TripLongline decorator registerDecorator(new TripLonglineDecorator(libelle)); - String oldCode = l(locale, "observe.common.oldCode3L"); // Species decorator - registerDecorator(new SpeciesDecorator(libelle, oldCode)); + registerDecorator(new SpeciesDecorator(libelle)); // ObjectObservedSpecies decorator registerDecorator(new ObjectObservedSpeciesDecorator(libelle)); diff --git a/observe-business/src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java b/observe-business/src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java index f5daae2..4f0b378 100644 --- a/observe-business/src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java +++ b/observe-business/src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java @@ -51,9 +51,9 @@ public class SpeciesDecorator extends ObserveDecorator<Species> { } - public SpeciesDecorator(String libelle, String oldCode) { + public SpeciesDecorator(String libelle) { super(Species.class, - "${faoCode}$s##${scientificLabel}$s##" + oldCode + " ${homeId}$s" + "${faoCode}$s##${scientificLabel}$s" ); this.libelle = libelle; } -- 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-4.x in repository tutti. See http://git.codelutin.com/tutti.git commit d560365dd70d4e0e2eb8ded10463960aab512328 Merge: a06fd5b 3532519 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 7 09:08:11 2016 +0100 Fixes #7995 Merge branch 'feature/7995' into develop-4.x observe-business/src/main/java/fr/ird/observe/DecoratorService.java | 3 +-- .../src/main/java/fr/ird/observe/decorator/SpeciesDecorator.java | 4 ++-- 2 files changed, 3 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm