[Pollen-commits] 16/16: Corrections suite à revue

2 Jul 2020

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 5d7948ff5e36b3b303333c37a517889bef765728
Author: Cécilia Bossard <bossard@codelutin.com>
Date:   Thu Jul 2 10:21:19 2020 +0200

    Corrections suite à revue
---
 .../pollen/persistence/entity/PollTopiaDao.java      | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

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 54e218af..48cdf14a 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,7 +64,11 @@ 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);
         }
 
@@ -82,7 +86,11 @@ 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);
         }
 
@@ -101,7 +109,11 @@ 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);
         }
 
@@ -128,7 +140,11 @@ 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);
         }
 
@@ -142,7 +158,11 @@ 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>.

    

[Pollen-commits] 16/16: Corrections suite à revue

chorem.org scm