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

OO-1494: delete reminders dureing the delete process of repository entries

parent e0b36d7e
No related branches found
No related tags found
No related merge requests found
...@@ -117,6 +117,15 @@ public class ReminderDAO { ...@@ -117,6 +117,15 @@ public class ReminderDAO {
numOfDeletedRows++; numOfDeletedRows++;
return numOfDeletedRows; return numOfDeletedRows;
} }
public int delete(RepositoryEntry entry) {
int rowsDeleted = 0;
List<Reminder> reminders = getReminders(entry);
for(Reminder reminder:reminders) {
rowsDeleted += delete(reminder);
}
return rowsDeleted;
}
/** /**
* *
......
...@@ -56,6 +56,7 @@ import org.olat.core.util.vfs.VFSLeaf; ...@@ -56,6 +56,7 @@ import org.olat.core.util.vfs.VFSLeaf;
import org.olat.course.assessment.manager.AssessmentModeDAO; import org.olat.course.assessment.manager.AssessmentModeDAO;
import org.olat.course.assessment.manager.UserCourseInformationsManager; import org.olat.course.assessment.manager.UserCourseInformationsManager;
import org.olat.course.certificate.CertificatesManager; import org.olat.course.certificate.CertificatesManager;
import org.olat.modules.reminder.manager.ReminderDAO;
import org.olat.repository.ErrorList; import org.olat.repository.ErrorList;
import org.olat.repository.RepositoryEntry; import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryEntryAllowToLeaveOptions; import org.olat.repository.RepositoryEntryAllowToLeaveOptions;
...@@ -119,6 +120,8 @@ public class RepositoryServiceImpl implements RepositoryService { ...@@ -119,6 +120,8 @@ public class RepositoryServiceImpl implements RepositoryService {
private UserCourseInformationsManager userCourseInformationsManager; private UserCourseInformationsManager userCourseInformationsManager;
@Autowired @Autowired
private AssessmentModeDAO assessmentModeDao; private AssessmentModeDAO assessmentModeDao;
@Autowired
private ReminderDAO reminderDao;
@Autowired @Autowired
private LifeFullIndexer lifeIndexer; private LifeFullIndexer lifeIndexer;
...@@ -311,7 +314,8 @@ public class RepositoryServiceImpl implements RepositoryService { ...@@ -311,7 +314,8 @@ public class RepositoryServiceImpl implements RepositoryService {
catalogManager.resourceableDeleted(entry); catalogManager.resourceableDeleted(entry);
// delete assessment modes // delete assessment modes
assessmentModeDao.delete(entry); assessmentModeDao.delete(entry);
// delete reminders
reminderDao.delete(entry);
//delete all policies //delete all policies
securityManager.deletePolicies(resource); securityManager.deletePolicies(resource);
dbInstance.commit(); dbInstance.commit();
......
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