From 1d1f530f9f998884d1bd88bde03fe4f4d92f6887 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Fri, 17 Nov 2017 09:12:40 +0100
Subject: [PATCH] OO-3147: remove the delete buttons, check if there is
something to clean up
---
.../java/org/olat/modules/webFeed/ui/ItemsController.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
index f0eb3e27057..3cf37d0d5f9 100644
--- a/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
+++ b/src/main/java/org/olat/modules/webFeed/ui/ItemsController.java
@@ -601,7 +601,12 @@ public class ItemsController extends BasicController implements Activateable2 {
// permanently remove item
feedResource = feedManager.deleteItem(item);
// remove delete and edit buttons of this item
- deleteButtons.remove(source);
+ for (Link deleteButton : deleteButtons) {
+ if (item.equals(deleteButton.getUserObject())) {
+ deleteButtons.remove(deleteButton);
+ break;
+ }
+ }
for (Link editButton : editButtons) {
if (item.equals(editButton.getUserObject())) {
editButtons.remove(editButton);
@@ -772,6 +777,7 @@ public class ItemsController extends BasicController implements Activateable2 {
* @param tmpItem
*/
private void cleanupTmpItemMediaDir(Item tmpItem) {
+ if(tmpItem == null) return;
String guid = tmpItem.getGuid();
if (guid == null) return;
--
GitLab