branch develop updated (728c958 -> 64f3e3d)
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 728c958 Mise à jour de develop local après release new 5d7bcdc Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) new 64f3e3d On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) 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 64f3e3d3cc1d9ce231bf5ee3b06d4f985ffe0d51 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Feb 13 14:57:39 2015 +0100 On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) commit 5d7bcdc5d940f325c330a05a1a2a6bb9ccdb3502 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Feb 13 14:54:09 2015 +0100 Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) Summary of changes: .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ .../service/administration/WaoUsersList.java | 2 +- .../wao/web/action/AbstractImportCsvAction.java | 2 +- 3 files changed, 26 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 wao. See http://git.codelutin.com/wao.git commit 5d7bcdc5d940f325c330a05a1a2a6bb9ccdb3502 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Feb 13 14:54:09 2015 +0100 Correction du tri des utilisateurs dans l'administration, on perdait les homonymes (termine #6666) --- .../main/java/fr/ifremer/wao/entity/WaoUsers.java | 24 ++++++++++++++++++++++ .../service/administration/WaoUsersList.java | 2 +- 2 files changed, 25 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 8d00fc7..4a5c814 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 @@ -22,6 +22,7 @@ package fr.ifremer.wao.entity; */ import com.google.common.base.Function; +import com.google.common.collect.ImmutableSet; import com.google.common.collect.Ordering; import java.util.Comparator; @@ -32,6 +33,13 @@ public class WaoUsers { return new GetLogin(); } + /** + * Tri selon le nom puis le prénom (casse ignorée). + */ + public static Comparator<WaoUser> lastFirstNameComparator() { + return Ordering.compound(ImmutableSet.of(lastNameComparator(), firstNameComparator())); + } + public static Comparator<WaoUser> fullNameComparator() { return Ordering.natural().onResultOf(getFullName()); } @@ -56,6 +64,14 @@ public class WaoUsers { return new GetLastName(); } + public static Comparator<WaoUser> firstNameComparator() { + return Ordering.from(String.CASE_INSENSITIVE_ORDER).onResultOf(getFirstName()); + } + + public static Function<WaoUser, String> getFirstName() { + return new GetFirstName(); + } + protected static class GetLogin implements Function<WaoUser, String> { @Override @@ -87,4 +103,12 @@ public class WaoUsers { return input.getLastName(); } } + + protected static class GetFirstName implements Function<WaoUser, String> { + + @Override + public String apply(WaoUser input) { + return input.getFirstName(); + } + } } 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 83e90a0..0047ea1 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.lastNameComparator()).addAll(waoUsers).build(); + this.waoUsers = ImmutableSortedSet.orderedBy(WaoUsers.lastFirstNameComparator()).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 64f3e3d3cc1d9ce231bf5ee3b06d4f985ffe0d51 Author: Brendan Le Ny <bleny@codelutin.com> Date: Fri Feb 13 14:57:39 2015 +0100 On autorise "text/plain" comme type MIME pour les fichiers CSV (termine #6664) --- .../main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java b/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java index df70a22..b873c36 100644 --- a/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java +++ b/wao-web/src/main/java/fr/ifremer/wao/web/action/AbstractImportCsvAction.java @@ -42,7 +42,7 @@ public abstract class AbstractImportCsvAction extends WaoJspActionSupport { private static final Log log = LogFactory.getLog(AbstractImportCsvAction.class); protected static final ImmutableSet<String> CSV_CONTENT_TYPES = - ImmutableSet.of("text/csv", "text/comma-separated-values", "application/vnd.ms-excel"); + ImmutableSet.of("text/csv", "text/comma-separated-values", "application/vnd.ms-excel", "text/plain"); protected transient ReferentialService service; -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm