Skip to content
Snippets Groups Projects
Commit d70df14b authored by srosse's avatar srosse
Browse files

OO-4195: delete relation lecture block to curriculum element

parent 0b69a19f
No related branches found
No related tags found
No related merge requests found
...@@ -78,6 +78,7 @@ import org.olat.modules.curriculum.model.CurriculumMember; ...@@ -78,6 +78,7 @@ import org.olat.modules.curriculum.model.CurriculumMember;
import org.olat.modules.curriculum.model.CurriculumRefImpl; import org.olat.modules.curriculum.model.CurriculumRefImpl;
import org.olat.modules.curriculum.model.CurriculumSearchParameters; import org.olat.modules.curriculum.model.CurriculumSearchParameters;
import org.olat.modules.curriculum.model.SearchMemberParameters; 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.TaxonomyLevel;
import org.olat.modules.taxonomy.TaxonomyLevelRef; import org.olat.modules.taxonomy.TaxonomyLevelRef;
import org.olat.repository.RepositoryEntry; import org.olat.repository.RepositoryEntry;
...@@ -111,6 +112,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat ...@@ -111,6 +112,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
@Autowired @Autowired
private CurriculumMemberQueries memberQueries; private CurriculumMemberQueries memberQueries;
@Autowired @Autowired
private LectureBlockToGroupDAO lectureBlockToGroupDao;
@Autowired
private RepositoryEntryMyCourseQueries myCourseQueries; private RepositoryEntryMyCourseQueries myCourseQueries;
@Autowired @Autowired
private RepositoryEntryDAO repositoryEntryDao; private RepositoryEntryDAO repositoryEntryDao;
...@@ -390,6 +393,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat ...@@ -390,6 +393,8 @@ public class CurriculumServiceImpl implements CurriculumService, OrganisationDat
} }
// remove relations to taxonomy // remove relations to taxonomy
curriculumElementToTaxonomyLevelDao.deleteRelation(reloadedElement); curriculumElementToTaxonomyLevelDao.deleteRelation(reloadedElement);
// remove relations to lecture blocks
lectureBlockToGroupDao.deleteLectureBlockToGroup(reloadedElement.getGroup());
boolean delete = true; boolean delete = true;
Map<String,CurriculumDataDeletable> deleteDelegates = CoreSpringFactory.getBeansOfType(CurriculumDataDeletable.class); Map<String,CurriculumDataDeletable> deleteDelegates = CoreSpringFactory.getBeansOfType(CurriculumDataDeletable.class);
......
...@@ -72,6 +72,7 @@ public class LectureBlockToGroupImpl implements Persistable, LectureBlockToGroup ...@@ -72,6 +72,7 @@ public class LectureBlockToGroupImpl implements Persistable, LectureBlockToGroup
this.lectureBlock = lectureBlock; this.lectureBlock = lectureBlock;
} }
@Override
public Group getGroup() { public Group getGroup() {
return group; return group;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment