From 095cd29678d0862f17aa3117ab14574102effdad Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 10 Sep 2013 16:29:06 +0200
Subject: [PATCH] OO-765: revert the change in FormBasicController which set
the whole container as dirty on every click
---
.../flexible/impl/FormBasicController.java | 21 +++++++++++--------
.../qpool/ui/AbstractItemListController.java | 5 +++++
2 files changed, 17 insertions(+), 9 deletions(-)
diff --git a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
index 18c85c125e1..c66a2673ed4 100644
--- a/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
+++ b/src/main/java/org/olat/core/gui/components/form/flexible/impl/FormBasicController.java
@@ -32,6 +32,7 @@ import org.olat.core.gui.components.Component;
import org.olat.core.gui.components.form.flexible.FormItem;
import org.olat.core.gui.components.form.flexible.FormItemContainer;
import org.olat.core.gui.components.form.flexible.FormUIFactory;
+import org.olat.core.gui.components.form.flexible.elements.InlineElement;
import org.olat.core.gui.components.panel.Panel;
import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Disposable;
@@ -345,7 +346,7 @@ public abstract class FormBasicController extends BasicController {
if (fe.getCommand().equals(org.olat.core.gui.components.form.Form.EVNT_FORM_CANCELLED.getCommand())) {
// Set container dirty to clear error messages. Do this before calling
// formCancelled() to let formCancelled override the dirtiness flag
- this.flc.setDirty(true);
+ flc.setDirty(true);
formResetted(ureq);
formCancelled(ureq);
return;
@@ -354,20 +355,22 @@ public abstract class FormBasicController extends BasicController {
* evaluate normal inner form events
*/
FormItem fiSrc = fe.getFormItemSource();
- // check for InlineElments remove as the tag library has been replaced
- /*
- if(fiSrc instanceof InlineElement){
- if(!((InlineElement) fiSrc).isInlineEditingElement()){ //OO-137
- this.flc.setDirty(true);
- }
- }*/
+ propagateDirtinessToContainer(fiSrc);
//
formInnerEvent(ureq, fiSrc, fe);
// no need to set container dirty, up to controller code if something is dirty
}
}
}
-
+
+ protected void propagateDirtinessToContainer(FormItem fiSrc) {
+ // check for InlineElments remove as the tag library has been replaced
+ if(fiSrc instanceof InlineElement){
+ if(!((InlineElement) fiSrc).isInlineEditingElement()){ //OO-137
+ flc.setDirty(true);
+ }
+ }
+ }
/**
* Set an optional form title that is rendered as a fieldset legend. If you
diff --git a/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java b/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
index c653d005219..a5db7b404bc 100644
--- a/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
+++ b/src/main/java/org/olat/modules/qpool/ui/AbstractItemListController.java
@@ -221,6 +221,11 @@ public abstract class AbstractItemListController extends FormBasicController
}
super.formInnerEvent(ureq, source, event);
}
+
+ @Override
+ protected void propagateDirtinessToContainer(FormItem fiSrc) {
+ //do nothing
+ }
@Override
public void event(Event event) {
--
GitLab