From 1d1e33d9a9ce7991c4ad49fd3a1e50a041baaf0c Mon Sep 17 00:00:00 2001
From: strentini <none@none>
Date: Wed, 13 Jul 2011 10:54:29 +0200
Subject: [PATCH] OLAT-6281 : ePortfolio-Sammelmappe: structure elements of
first page can now be deleted. (Structure-Elements are now handled separately
from pages )
FXOLAT-193
--HG--
branch : uzhFixes711
---
.../olat/portfolio/ui/structel/edit/EPTOCController.java | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/edit/EPTOCController.java b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/edit/EPTOCController.java
index d2e120d6733..140e6d43dd8 100644
--- a/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/edit/EPTOCController.java
+++ b/olat3/webapp/WEB-INF/src/org/olat/portfolio/ui/structel/edit/EPTOCController.java
@@ -277,7 +277,7 @@ public class EPTOCController extends BasicController {
// refresh the view
fireEvent(ureq, Event.CHANGED_EVENT);
} else if (structureClicked != null) {
- if ((structureClicked instanceof EPPage || structureClicked instanceof EPStructureElement)
+ if ((structureClicked instanceof EPPage)
&& !(structureClicked instanceof EPAbstractMap)) {
PortfolioStructure ps = structureClicked;
while (ePFMgr.loadStructureParent(ps) != null) {
@@ -291,6 +291,12 @@ public class EPTOCController extends BasicController {
} else {
showError("last.page.not.deletable");
}
+ } else if(structureClicked instanceof EPStructureElement
+ && !(structureClicked instanceof EPAbstractMap)) {
+ //structures should always be deletable
+ eSTMgr.removeStructureRecursively(structureClicked);
+ // refresh the view
+ fireEvent(ureq, Event.CHANGED_EVENT);
} else {
showInfo("element.not.deletable");
}
--
GitLab