From 577e99d840f859c8a723eb2add8e830219385889 Mon Sep 17 00:00:00 2001 From: Stephan Richter Date: Tue, 10 Mar 2026 10:16:27 +0100 Subject: [PATCH] fixed bug: some polls were shown several times in the list Signed-off-by: Stephan Richter --- .../main/java/de/srsoftware/umbrella/poll/SqliteDb.java | 8 +++++--- web/src/main/resources/web/css/default.css | 4 ++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java b/poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java index 25734cc9..fd5721ca 100644 --- a/poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java +++ b/poll/src/main/java/de/srsoftware/umbrella/poll/SqliteDb.java @@ -133,15 +133,17 @@ public class SqliteDb extends BaseDb implements PollDb { ps.setLong(1,user.id()); ps.setLong(2, user.id()); var rs = ps.executeQuery(); - var list = new ArrayList(); + var map = new HashMap(); while (rs.next()) { + var pollId = rs.getString(ID); + if (map.containsKey(pollId)) continue; var poll = Poll.of(rs); var perm = rs.getInt(PERMISSION); if (perm != 0) poll.permissions().put(user,Permission.of(perm)); - list.add(poll); + map.put(pollId,poll); } rs.close(); - return list; + return map.values().stream().sorted(Comparator.comparing(Poll::name)).toList(); } catch (SQLException sqle){ throw failedToLoadObject(TABLE_POLLS); } diff --git a/web/src/main/resources/web/css/default.css b/web/src/main/resources/web/css/default.css index e4ca5d87..4eb92421 100644 --- a/web/src/main/resources/web/css/default.css +++ b/web/src/main/resources/web/css/default.css @@ -619,6 +619,10 @@ a.wikilink{ } } +.poll .weight .description{ + display: block; + margin: 0 5px; +} @media screen and (max-width: 600px) { .grid2,