From 46f7d50ed7310b814663280858c5134044997c9f Mon Sep 17 00:00:00 2001 From: Andreas Svanberg <andreass@dsv.su.se> Date: Mon, 17 Mar 2025 10:51:28 +0100 Subject: [PATCH] Inverted logic, deletion is not allowed by default. --- .../dsv/scipro/forum/panels/threaded/ForumPostPanel.java | 2 +- .../forum/panels/threaded/ViewForumThreadPanel.java | 5 +++++ .../java/se/su/dsv/scipro/reviewer/timeline/Event.java | 8 +------- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java index c86fbe18f6..225240d8e1 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ForumPostPanel.java @@ -89,7 +89,7 @@ public class ForumPostPanel extends Panel { } protected boolean allowDeletion() { - return true; + return false; } protected void onPostDeleted() {} diff --git a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java index e0b29f4ec2..06b89d7e14 100644 --- a/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java +++ b/view/src/main/java/se/su/dsv/scipro/forum/panels/threaded/ViewForumThreadPanel.java @@ -61,6 +61,11 @@ public class ViewForumThreadPanel<A> extends GenericPanel<A> { ListView<ForumPost> listView = this; item.add( new ForumPostPanel(POST, item.getModel()) { + @Override + protected boolean allowDeletion() { + return true; + } + @Override protected void onPostDeleted() { // Refresh the list of posts diff --git a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/Event.java b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/Event.java index 4c58b69967..eb01e900c3 100644 --- a/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/Event.java +++ b/view/src/main/java/se/su/dsv/scipro/reviewer/timeline/Event.java @@ -22,13 +22,7 @@ interface Event { @Override public Component component(String id, IModel<Event> model) { - return new ForumPostPanel(id, model.map(Message.class::cast).map(m -> m.forumPost)) { - @Override - protected boolean allowDeletion() { - // Do not allow deleting forum posts in the timeline - return false; - } - }; + return new ForumPostPanel(id, model.map(Message.class::cast).map(m -> m.forumPost)); } @Override