diff --git a/WEB-INF/src/controleurs/Discover.java b/WEB-INF/src/controleurs/Discover.java index feb457296ed662710d8584c62ad75219d94a476c..58ed27402f527ccb93a8c1d0aad40d8bc50f87a6 100644 --- a/WEB-INF/src/controleurs/Discover.java +++ b/WEB-INF/src/controleurs/Discover.java @@ -43,7 +43,6 @@ public class Discover extends HttpServlet { try { followedThreads = userDao.getThreadsFollowedByUser(user); - System.out.println(followedThreads.get(2)); } catch (SQLException sqle) { sqle.getStackTrace(); @@ -54,14 +53,12 @@ public class Discover extends HttpServlet { MyThread msgThread = null; try { msgThread = threadDao.getThreadById(message.getThreadId()); - System.out.println(msgThread.getId()); } catch (SQLException e) { throw new RuntimeException(e); } User sender = userDao.getUserById(message.getSenderId()); String senderName = sender.getUserName(); boolean followed = followedThreads.contains(msgThread.getId()); - System.out.println("suivi : " + followed); out.println("<div class=\"message\">"); out.println("<h3 class=\"msgThread\">" + msgThread.getThreadName() + "</h3>"); @@ -74,7 +71,7 @@ public class Discover extends HttpServlet { if (followed) { out.println("<button class=\"followed\" type=\"submit\">Followed</button>"); } - else { + else if (!followed) { out.println("<button class=\"unfollowed\" type=\"submit\">Follow</button>"); } out.println("</form>"); diff --git a/WEB-INF/src/controleurs/FollowThread.java b/WEB-INF/src/controleurs/FollowThread.java index 857ec851b5f27c2cff9f614a7cc9c95f742bb98d..80833190a8e7a20f348b9cb473e8524a07d18145 100644 --- a/WEB-INF/src/controleurs/FollowThread.java +++ b/WEB-INF/src/controleurs/FollowThread.java @@ -54,7 +54,7 @@ public class FollowThread extends HttpServlet { sqle.getStackTrace(); } } - else { + else if (followed) { try { userDao.unfollowThread(user, threadDao.getThreadById((Integer.parseInt(req.getParameter("threadid"))))); res.sendRedirect("http://localhost:8080/s4a021-web-backend/Discover");