branch feature/refonte-ui updated (5d7948ff -> 2c5ffb09)
This is an automated email from the git hooks/post-receive script. New change to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git from 5d7948ff Corrections suite à revue new 2c5ffb09 Correction problème de merge 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 2c5ffb0958e0027240d1b62bac82f6f07946db73 Author: Cécilia Bossard <bossard@codelutin.com> Date: Thu Jul 2 10:48:10 2020 +0200 Correction problème de merge Summary of changes: .../pollen/persistence/entity/PollTopiaDao.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/refonte-ui in repository pollen. See https://gitlab.nuiton.org/chorem/pollen.git commit 2c5ffb0958e0027240d1b62bac82f6f07946db73 Author: Cécilia Bossard <bossard@codelutin.com> Date: Thu Jul 2 10:48:10 2020 +0200 Correction problème de merge --- .../pollen/persistence/entity/PollTopiaDao.java | 21 +-------------------- 1 file changed, 1 insertion(+), 20 deletions(-) diff --git a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java index 48cdf14a..32c2d433 100644 --- a/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java +++ b/pollen-persistence/src/main/java/org/chorem/pollen/persistence/entity/PollTopiaDao.java @@ -64,11 +64,7 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { parameters.put("user", user); String hqlCondition = ""; -<<<<<<< HEAD if (StringUtils.isNotBlank(filter)) { -======= - if (StringUtils.isNotEmpty(filter)) { ->>>>>>> 2376d098bf3444420202e9150234c6ea44fa06e0 hqlCondition += filterCondition(filter, parameters); } @@ -86,11 +82,7 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { hql += " AND " + DaoUtils.getSearchClause("poll", parameters, Poll.PROPERTY_TITLE, search); } -<<<<<<< HEAD if (StringUtils.isNotBlank(filter)) { -======= - if (StringUtils.isNotEmpty(filter)) { ->>>>>>> 2376d098bf3444420202e9150234c6ea44fa06e0 hql +=" AND " + filterCondition(filter, parameters); } @@ -109,11 +101,7 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { hql += " AND " + DaoUtils.getSearchClause("poll", parameters, Poll.PROPERTY_TITLE, search); } -<<<<<<< HEAD if (StringUtils.isNotBlank(filter)) { -======= - if (StringUtils.isNotEmpty(filter)) { ->>>>>>> 2376d098bf3444420202e9150234c6ea44fa06e0 hql +=" AND " + filterCondition(filter, parameters); } @@ -140,11 +128,8 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { hql += " AND " + DaoUtils.getSearchClause("poll", parameters, Poll.PROPERTY_TITLE, search); } -<<<<<<< HEAD + if (StringUtils.isNotBlank(filter)) { -======= - if (StringUtils.isNotEmpty(filter)) { ->>>>>>> 2376d098bf3444420202e9150234c6ea44fa06e0 hql +=" AND " + filterCondition(filter, parameters); } @@ -158,11 +143,7 @@ public class PollTopiaDao extends AbstractPollTopiaDao<Poll> { } private String filterCondition(String filter, Map<String, Object> parameters) { -<<<<<<< HEAD switch (filter.toUpperCase()) { -======= - switch (filter) { ->>>>>>> 2376d098bf3444420202e9150234c6ea44fa06e0 case "PAST": parameters.put("today", new Date()); return "poll." + Poll.PROPERTY_END_DATE + " IS NOT NULL " -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm