From d70df14b5cd02231c6d0ec1345d652104933d522 Mon Sep 17 00:00:00 2001
From: srosse <stephane.rosse@frentix.com>
Date: Thu, 22 Aug 2019 10:07:33 +0200
Subject: [PATCH] OO-4195: delete relation lecture block to curriculum element
---
.../modules/curriculum/manager/CurriculumServiceImpl.java | 5 +++++
.../olat/modules/lecture/model/LectureBlockToGroupImpl.java | 1 +
2 files changed, 6 insertions(+)
diff --git a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
index 96a14400115..70a97606b93 100644
--- a/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
+++ b/src/main/java/org/olat/modules/curriculum/manager/CurriculumServiceImpl.java
@@ -78,6 +78,7 @@ import org.olat.modules.curriculum.model.CurriculumMember;
import org.olat.modules.curriculum.model.CurriculumRefImpl;
import org.olat.modules.curriculum.model.CurriculumSearchParameters;
import org.olat.modules.curriculum.model.SearchMemberParameters;
+import org.olat.modules.lecture.manager.LectureBlockToGroupDAO;
import org.olat.modules.taxonomy.TaxonomyLevel;
import org.olat.modules.taxonomy.TaxonomyLevelRef;
import org.olat.repository.RepositoryEntry;
@@ -111,6 +112,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
@Autowired
private CurriculumMemberQueries memberQueries;
@Autowired
+ private LectureBlockToGroupDAO lectureBlockToGroupDao;
+ @Autowired
private RepositoryEntryMyCourseQueries myCourseQueries;
@Autowired
private RepositoryEntryDAO repositoryEntryDao;
@@ -390,6 +393,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
}
// remove relations to taxonomy
curriculumElementToTaxonomyLevelDao.deleteRelation(reloadedElement);
+ // remove relations to lecture blocks
+ lectureBlockToGroupDao.deleteLectureBlockToGroup(reloadedElement.getGroup());
boolean delete = true;
Map<String,CurriculumDataDeletable> deleteDelegates = CoreSpringFactory.getBeansOfType(CurriculumDataDeletable.class);
diff --git a/src/main/java/org/olat/modules/lecture/model/LectureBlockToGroupImpl.java b/src/main/java/org/olat/modules/lecture/model/LectureBlockToGroupImpl.java
index 18dcb05640f..0afba8be6fc 100644
--- a/src/main/java/org/olat/modules/lecture/model/LectureBlockToGroupImpl.java
+++ b/src/main/java/org/olat/modules/lecture/model/LectureBlockToGroupImpl.java
@@ -72,6 +72,7 @@ public class LectureBlockToGroupImpl implements Persistable, LectureBlockToGroup
this.lectureBlock = lectureBlock;
}
+ @Override
public Group getGroup() {
return group;
}
--
GitLab