diff --git a/src/main/java/org/olat/modules/curriculum/model/CurriculumImpl.java b/src/main/java/org/olat/modules/curriculum/model/CurriculumImpl.java index 2b8293004d942b2b08e1793a22ad3b8af0363123..81a90fc7af49e6e27783d1b78c95cc4acd8b0b52 100644 --- a/src/main/java/org/olat/modules/curriculum/model/CurriculumImpl.java +++ b/src/main/java/org/olat/modules/curriculum/model/CurriculumImpl.java @@ -86,7 +86,7 @@ public class CurriculumImpl implements Persistable, Curriculum { private Group group; @ManyToOne(targetEntity=OrganisationImpl.class,fetch=FetchType.LAZY,optional=true) - @JoinColumn(name="fk_organisation", nullable=true, insertable=true, updatable=false) + @JoinColumn(name="fk_organisation", nullable=true, insertable=true, updatable=true) private Organisation organisation; @Override diff --git a/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumController.java b/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumController.java index aa388b87ccfe14b093b5a2d57598b451aff0f3c4..62685f8f2f6175daa3ca19090767c772c894303d 100644 --- a/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumController.java +++ b/src/main/java/org/olat/modules/curriculum/ui/EditCurriculumController.java @@ -179,15 +179,16 @@ public class EditCurriculumController extends FormBasicController { @Override protected void formOK(UserRequest ureq) { + //create a new one + Organisation organisation; + if(organisationEl != null && organisationEl.isOneSelected()) { + organisation = organisationService + .getOrganisation(new OrganisationRefImpl(Long.valueOf(organisationEl.getSelectedKey()))); + } else { + organisation = organisationService.getDefaultOrganisation(); + } + if(curriculum == null) { - //create a new one - Organisation organisation; - if(organisationEl != null && organisationEl.isOneSelected()) { - organisation = organisationService - .getOrganisation(new OrganisationRefImpl(Long.valueOf(organisationEl.getSelectedKey()))); - } else { - organisation = organisationService.getDefaultOrganisation(); - } curriculum = curriculumService .createCurriculum(identifierEl.getValue(), displayNameEl.getValue(), descriptionEl.getValue(), organisation); curriculumService.addMember(curriculum, getIdentity(), CurriculumRoles.curriculummanager); @@ -196,6 +197,7 @@ public class EditCurriculumController extends FormBasicController { curriculum.setIdentifier(identifierEl.getValue()); curriculum.setDisplayName(displayNameEl.getValue()); curriculum.setDescription(descriptionEl.getValue()); + curriculum.setOrganisation(organisation); curriculum = curriculumService.updateCurriculum(curriculum); }