diff --git a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditController.java b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditController.java
index b4465b95854cd6188b86ed544e3197eeb63f7864..454561498f84becefeaa22e91ba228bfdfd22513 100644
--- a/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditController.java
+++ b/src/main/java/de/bps/onyx/plugin/course/nodes/iq/IQEditController.java
@@ -703,7 +703,7 @@ public class IQEditController extends ActivateableTabbableDefaultController impl
editTestButton = LinkFactory.createButtonSmall("command.editRepFile", myContent, this);
}
if (isEditable(urequest.getIdentity(), re)) {
- myContent.put(editTestButton);
+ myContent.put("command.editRepFile", editTestButton);
} else {
myContent.remove(editTestButton);
}
diff --git a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdMoveCopy.java b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdMoveCopy.java
index a1a01f416345b4d599c21ce8ca5143ea96f4a539..02d18260dd6189dbcff8b51c9f3a940bcccd8f8f 100644
--- a/src/main/java/org/olat/core/commons/modules/bc/commands/CmdMoveCopy.java
+++ b/src/main/java/org/olat/core/commons/modules/bc/commands/CmdMoveCopy.java
@@ -97,7 +97,7 @@ public class CmdMoveCopy extends DefaultController implements FolderCommand {
selTree.setTreeModel(ftm);
selTree.addListener(this);
- main.put(selTree);
+ main.put(selTree.getComponentName(), selTree);
if (move) main.contextPut("move", Boolean.TRUE);
setInitialComponent(main);
diff --git a/src/main/java/org/olat/core/gui/components/Component.java b/src/main/java/org/olat/core/gui/components/Component.java
index 2781a8c5ff784e579dc646efcbc2615ba078baa3..285f1e64d285597e0826497f9f7a342ca3de63ac 100644
--- a/src/main/java/org/olat/core/gui/components/Component.java
+++ b/src/main/java/org/olat/core/gui/components/Component.java
@@ -420,7 +420,7 @@ public abstract class Component {
* @return
*/
public Container getParent(){
- return this.parent;
+ return parent;
}
/**
diff --git a/src/main/java/org/olat/core/gui/components/Container.java b/src/main/java/org/olat/core/gui/components/Container.java
index 781086b8af8b4f3752ef6ad402d67f37e3eebdf3..79ab79d993bfb439a022670ef901ae1b3c3a11bb 100644
--- a/src/main/java/org/olat/core/gui/components/Container.java
+++ b/src/main/java/org/olat/core/gui/components/Container.java
@@ -63,17 +63,6 @@ public abstract class Container extends Component implements ComponentCollection
super(id, name, translator);
}
- /**
- * puts a component into this container
- * @deprecated Please use put(String name, Component component) instead!
- * @param component
- */
- //FIXME fj: replace with new style
- public void put(Component component) {
- String coName = component.getComponentName();
- put(coName, component);
- }
-
/* puts the component into this container.
* @param name how the component is called, e.g. for rendering in a html fragment: $r.render("name")
* @param component the component to add as a child into this container
diff --git a/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java b/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
index a2d462af53d4ba7c337e9d0fec86e1c49bb5103c..634ac77b98ea5e5653efbdcb4d3e977c78e1d20e 100644
--- a/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
+++ b/src/main/java/org/olat/core/gui/components/textboxlist/TextBoxListRenderer.java
@@ -155,13 +155,19 @@ public class TextBoxListRenderer implements ComponentRenderer {
}
output.append("],\n");
- // otherwise, o_ffEvents are fired: OO-137 ( invoke o_ffEvent on UserAdd or userRemove ) but only in flexiform
+ // otherwise, o_ffEvents are fired: OO-137 ( invoke o_ffEvent on UserAdd or userRemove ) but only in flexiform
String o_ffEvent = FormJSHelper.getJSFnCallFor(rootForm, dispatchId, 2);
- output.append(" afterTagAdded: function(input){\n")
- .append(o_ffEvent).append("; console.log('Added',input)},\n")
- .append(" afterTagRemoved: function(input){\n")
- .append(o_ffEvent).append("; console.log('Remove',input)}\n");
- output.append(" });\n")
+ output.append(" afterTagAdded: function(event,ui){\n")
+ .append(" if(!ui.duringInitialization) {")
+ .append(o_ffEvent).append(";\n")
+ .append(" }\n")
+ .append(" },\n")
+ .append(" afterTagRemoved: function(event,ui){\n")
+ .append(" if(!ui.duringInitialization) {")
+ .append(o_ffEvent).append(";\n")
+ .append(" }\n")
+ .append(" }\n")
+ .append(" });\n")
.append("})\n");
output.append(FormJSHelper.getJSEnd()).append(lineBreak);
diff --git a/src/main/java/org/olat/user/DisplayPortraitController.java b/src/main/java/org/olat/user/DisplayPortraitController.java
index c5a513935e2208f693831d4beb189176856ce723..3c334bd09b36389ea0520b375163e5a1e8b99155 100644
--- a/src/main/java/org/olat/user/DisplayPortraitController.java
+++ b/src/main/java/org/olat/user/DisplayPortraitController.java
@@ -136,7 +136,7 @@ public class DisplayPortraitController extends BasicController {
if (portrait != null){
ic = new ImageComponent("image");
ic.setMediaResource(portrait);
- myContent.put(ic);
+ myContent.put("image", ic);
}
}
diff --git a/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql b/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
new file mode 100644
index 0000000000000000000000000000000000000000..cc7f9a5f215fb502d8c703a2f73d49dcf9a96256
--- /dev/null
+++ b/src/main/resources/database/postgresql/alter_8_4_0_to_9_0_0.sql
@@ -0,0 +1,27 @@
+-- question item
+create table if not exists o_qp_pool (
+ id int8 not null,
+ creationdate timestamp,
+ lastmodified timestamp,
+ q_name varchar(255),
+ primary key (id)
+);
+
+create table if not exists o_qp_item (
+ id int8 not null,
+ creationdate timestamp,
+ lastmodified timestamp,
+ q_subject varchar(255),
+ primary key (id)
+);
+
+create table if not exists o_qp_pool_2_item (
+ id int8 not null,
+ creationdate timestamp,
+ fk_pool_id int8 not null,
+ fk_item_id int8 not null,
+ primary key (id)
+);
+alter table o_qp_pool_2_item add constraint idx_qp_pool_2_item_pool_id foreign key (fk_pool_id) references o_qp_pool(id);
+alter table o_qp_pool_2_item add constraint idx_qp_pool_2_item_item_id foreign key (fk_item_id) references o_qp_item(id);
+