branch develop updated (0be4426 -> 34917dc)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository wao. See http://git.codelutin.com/wao.git from 0be4426 Fusion des modifications faites pour la release dans develop new 88c7397 Quand on enregistre le formulaire de modification d'un utilsateur, on doit retourner vers la liste des utilisateurs de la société (fixes #6534) new 57de5a7 On trie les listes d'utilisateurs par nom (fixes #6535) new 28585dc Erreur si on créee un laboratoire avec des membres (fixes #6554) new 34917dc Correction d'une inversion dans les bundles The 4 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 34917dc3441f446b9793010d6cd59c385e19b146 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:38:55 2015 +0100 Correction d'une inversion dans les bundles commit 28585dccb087b5b34282bdb67277cf0bc366dcc7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:36:42 2015 +0100 Erreur si on créee un laboratoire avec des membres (fixes #6554) commit 57de5a764f631a890dcfcaf70239b42e997d9c72 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:28:50 2015 +0100 On trie les listes d'utilisateurs par nom (fixes #6535) commit 88c7397645a89eed055aa08c0fe0e8142ca9f767 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:20:19 2015 +0100 Quand on enregistre le formulaire de modification d'un utilsateur, on doit retourner vers la liste des utilisateurs de la société (fixes #6534) Summary of changes: .../src/main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 ++++++++++++++++ .../service/administration/LaboratoriesService.java | 7 +++---- .../services/service/administration/WaoUsersList.java | 2 +- .../wao/web/action/administration/EditWaoUserAction.java | 4 +++- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 2 +- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- 6 files changed, 25 insertions(+), 8 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 wao. See http://git.codelutin.com/wao.git commit 88c7397645a89eed055aa08c0fe0e8142ca9f767 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:20:19 2015 +0100 Quand on enregistre le formulaire de modification d'un utilsateur, on doit retourner vers la liste des utilisateurs de la société (fixes #6534) --- .../fr/ifremer/wao/web/action/administration/EditWaoUserAction.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java index 8367e62..5c161ee 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/administration/EditWaoUserAction.java @@ -71,6 +71,8 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable updateWaoUserCommand = service.newUpdateWaoUserCommand(getObsProgram(), optionalWaoUserId, optionalOrganisationId); + setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); + } @Override @@ -115,7 +117,7 @@ public class EditWaoUserAction extends WaoJspActionSupport implements Preparable session.addMessage(t("wao.ui.form.updateWaoUserCommand.success", updateWaoUserCommand.getWaoUser().getLogin())); // for redirection - setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getTopiaId()); + setOrganisationId(updateWaoUserCommand.getWaoUser().getOrganisation().getCompany().getTopiaId()); String result; if (getAuthenticatedWaoUser().isAuthorizedToViewCompanyUsers()) { -- 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 wao. See http://git.codelutin.com/wao.git commit 57de5a764f631a890dcfcaf70239b42e997d9c72 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:28:50 2015 +0100 On trie les listes d'utilisateurs par nom (fixes #6535) --- .../src/main/java/fr/ifremer/wao/entity/WaoUsers.java | 16 ++++++++++++++++ .../services/service/administration/WaoUsersList.java | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java index d8b7680..8d00fc7 100644 --- a/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java +++ b/wao-persistence/src/main/java/fr/ifremer/wao/entity/WaoUsers.java @@ -48,6 +48,14 @@ public class WaoUsers { return new GetOrganisation(); } + public static Comparator<WaoUser> lastNameComparator() { + return Ordering.from(String.CASE_INSENSITIVE_ORDER).onResultOf(getLastName()); + } + + public static Function<WaoUser, String> getLastName() { + return new GetLastName(); + } + protected static class GetLogin implements Function<WaoUser, String> { @Override @@ -71,4 +79,12 @@ public class WaoUsers { return input.getOrganisation(); } } + + protected static class GetLastName implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getLastName(); + } + } } diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java index aeab72d..83e90a0 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/WaoUsersList.java @@ -44,7 +44,7 @@ public class WaoUsersList { public WaoUsersList(Organisation organisation, Collection<WaoUser> waoUsers) { this.organisation = organisation; - this.waoUsers = ImmutableSortedSet.orderedBy(WaoUsers.loginComparator()).addAll(waoUsers).build(); + this.waoUsers = ImmutableSortedSet.orderedBy(WaoUsers.lastNameComparator()).addAll(waoUsers).build(); } public Organisation getOrganisation() { -- 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 wao. See http://git.codelutin.com/wao.git commit 28585dccb087b5b34282bdb67277cf0bc366dcc7 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:36:42 2015 +0100 Erreur si on créee un laboratoire avec des membres (fixes #6554) --- .../wao/services/service/administration/LaboratoriesService.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java index 0daf1c5..bfb5439 100644 --- a/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java +++ b/wao-services/src/main/java/fr/ifremer/wao/services/service/administration/LaboratoriesService.java @@ -93,13 +93,12 @@ public class LaboratoriesService extends WaoServiceSupport { public void save(Laboratory laboratory) { - Company ifremer = getCompaniesService().getIfremer(); - laboratory.setCompany(ifremer); - LaboratoryTopiaDao dao = getLaboratoryDao(); - dao.saveNullable(laboratory); + Company ifremer = getCompaniesService().getIfremer(); + laboratory.setCompany(ifremer); + commit(); } -- 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 wao. See http://git.codelutin.com/wao.git commit 34917dc3441f446b9793010d6cd59c385e19b146 Author: Brendan Le Ny <bleny@codelutin.com> Date: Tue Jan 27 16:38:55 2015 +0100 Correction d'une inversion dans les bundles --- wao-web/src/main/resources/i18n/wao-web_en_GB.properties | 2 +- wao-web/src/main/resources/i18n/wao-web_fr_FR.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties index bfaef36..4d26f6e 100644 --- a/wao-web/src/main/resources/i18n/wao-web_en_GB.properties +++ b/wao-web/src/main/resources/i18n/wao-web_en_GB.properties @@ -243,7 +243,7 @@ wao.ui.field.FishingZone.facadeName=Facade wao.ui.field.FishingZone.sectorName=Sector wao.ui.field.Laboratory.active=Active wao.ui.field.Laboratory.name=Name -wao.ui.field.Laboratory.waoUser=Membres du laboratoire +wao.ui.field.Laboratory.waoUser=Laboratory members wao.ui.field.SampleRow.appliedCoverageRate=Applied coverage rate wao.ui.field.SampleRow.averageObservationsCount=Observations wao.ui.field.SampleRow.averageTideTime=Average tide time diff --git a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties index bddfbdd..3e5d06b 100644 --- a/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties +++ b/wao-web/src/main/resources/i18n/wao-web_fr_FR.properties @@ -244,7 +244,7 @@ wao.ui.field.FishingZone.facadeName=Façade wao.ui.field.FishingZone.sectorName=Zone wao.ui.field.Laboratory.active=Actif wao.ui.field.Laboratory.name=Nom -wao.ui.field.Laboratory.waoUser=Laboratory members +wao.ui.field.Laboratory.waoUser=Membres du laboratoire wao.ui.field.SampleRow.appliedCoverageRate=Taux de couverture appliqué wao.ui.field.SampleRow.averageObservationsCount=Nombre d'observations wao.ui.field.SampleRow.averageTideTime=Durée moyenne d'une marée -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm