Merge with 26daacc5d2119392bac22ac119001f640078aee5

src/main/java/org/olat/course/assessment/AssessmentModeManager.java

@@ -28,6 +28,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.olat.basesecurity.IdentityRef;
 import org.olat.course.assessment.model.SearchAssessmentModeParams;
 import org.olat.group.BusinessGroup;
+import org.olat.group.BusinessGroupRef;
 import org.olat.group.area.BGArea;
 import org.olat.repository.RepositoryEntry;
 import org.olat.repository.RepositoryEntryRef;
@@ -49,6 +50,8 @@ public interface AssessmentModeManager {
 	
 	public AssessmentModeToGroup createAssessmentModeToGroup(AssessmentMode mode, BusinessGroup group);
 	
+	public void deleteAssessmentModesToGroup(BusinessGroupRef group);
+	
 	public AssessmentModeToArea createAssessmentModeToArea(AssessmentMode mode, BGArea area);
 	
 

src/main/java/org/olat/course/assessment/manager/AssessmentModeManagerImpl.java

@@ -19,7 +19,8 @@
  */
 package org.olat.course.assessment.manager;
 
-import static org.olat.core.commons.persistence.PersistenceHelper.*;
+import static org.olat.core.commons.persistence.PersistenceHelper.appendAnd;
+import static org.olat.core.commons.persistence.PersistenceHelper.appendFuzzyLike;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -55,6 +56,7 @@ import org.olat.course.assessment.model.AssessmentModeToGroupImpl;
 import org.olat.course.assessment.model.SearchAssessmentModeParams;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupImpl;
+import org.olat.group.BusinessGroupRef;
 import org.olat.group.area.BGArea;
 import org.olat.group.area.BGAreaManager;
 import org.olat.group.area.BGtoAreaRelationImpl;
@@ -400,6 +402,14 @@ public class AssessmentModeManagerImpl implements AssessmentModeManager {
 		return modeToGroup;
 	}
 
+	@Override
+	public void deleteAssessmentModesToGroup(BusinessGroupRef group) {
+		String q = "delete from courseassessmentmodetogroup as modegrrel where modegrrel.businessGroup.key=:groupKey";
+		dbInstance.getCurrentEntityManager().createQuery(q)
+			.setParameter("groupKey", group.getKey())
+			.executeUpdate();
+	}
+
 	@Override
 	public AssessmentModeToArea createAssessmentModeToArea(AssessmentMode mode, BGArea area) {
 		AssessmentModeToAreaImpl modeToArea = new AssessmentModeToAreaImpl();

src/main/java/org/olat/course/assessment/ui/AssessmentModeEditController.java

@@ -440,7 +440,7 @@ public class AssessmentModeEditController extends FormBasicController {
 		if(targetEl.isOneSelected()) {
 			Target target = AssessmentMode.Target.valueOf(targetEl.getSelectedKey());
 			if(target == Target.courseAndGroups || target == Target.groups) {
-				if(groupKeys.isEmpty()) {
+				if(groupKeys.isEmpty() && areaKeys.isEmpty()) {
 					targetEl.setErrorKey("error.group.missing", null);
 					allOk &= false;
 				}	

src/main/java/org/olat/group/area/BGAreaManagerImpl.java

@@ -121,17 +121,20 @@ public class BGAreaManagerImpl extends BasicManager implements BGAreaManager {
 	/**
 	 * @see org.olat.group.area.BGAreaManager#deleteBGArea(org.olat.group.area.BGArea)
 	 */
-	// o_clusterOK by:cg must be synchronized too
+	@Override
 	public void deleteBGArea(final BGArea area) {
 		final OLATResource resource = area.getResource();
 		
-		CoordinatorManager.getInstance().getCoordinator().getSyncer().doInSync(resource, new SyncerExecutor(){
+		CoordinatorManager.getInstance().getCoordinator().getSyncer().doInSync(resource, new SyncerExecutor() {
+			@Override
 			public void execute() {
 				BGArea reloadArea = loadArea(area.getKey());
 				if (reloadArea != null) {
 					// 1) delete all area - group relations
 					deleteBGtoAreaRelations(reloadArea);
-					// 2) delete area itself
+					// 2) delete area - assessment mode relations
+					deleteAssessmentModeToAreaRelations(reloadArea);
+					// 3) delete area itself
 					dbInstance.deleteObject(reloadArea);
 					logAudit("Deleted Business Group Area", reloadArea.toString());
 				} else {
@@ -146,6 +149,7 @@ public class BGAreaManagerImpl extends BasicManager implements BGAreaManager {
 	 * 
 	 * @param group
 	 */
+	@Override
 	public void deleteBGtoAreaRelations(BusinessGroup group) {
 		StringBuilder sb = new StringBuilder();
 		sb.append(" delete from ").append(BGtoAreaRelationImpl.class.getName()).append(" as bgarel where bgarel.businessGroup.key=:groupKey");
@@ -450,4 +454,13 @@ public class BGAreaManagerImpl extends BasicManager implements BGAreaManager {
 			.setParameter("areaKey", area.getKey())
 			.executeUpdate();
 	}
+	
+	private void deleteAssessmentModeToAreaRelations(BGArea area) {
+		StringBuilder sb = new StringBuilder();
+		sb.append("delete from courseassessmentmodetoarea as modearel where modearel.area.key=:areaKey");
+		
+		dbInstance.getCurrentEntityManager().createQuery(sb.toString())
+			.setParameter("areaKey", area.getKey())
+			.executeUpdate();
+	}
 }
\ No newline at end of file

src/main/java/org/olat/group/manager/BusinessGroupServiceImpl.java

@@ -68,6 +68,7 @@ import org.olat.core.util.mail.MailTemplate;
 import org.olat.core.util.mail.MailerResult;
 import org.olat.core.util.resource.OLATResourceableJustBeforeDeletedEvent;
 import org.olat.core.util.resource.OresHelper;
+import org.olat.course.assessment.AssessmentModeManager;
 import org.olat.group.BusinessGroup;
 import org.olat.group.BusinessGroupAddResponse;
 import org.olat.group.BusinessGroupManagedFlag;
@@ -147,6 +148,8 @@ public class BusinessGroupServiceImpl implements BusinessGroupService, UserDataD
 	@Autowired
 	private ContactDAO contactDao;
 	@Autowired
+	private AssessmentModeManager assessmentModeMgr;
+	@Autowired
 	private BusinessGroupRelationDAO businessGroupRelationDAO;
 	@Autowired
 	private RepositoryEntryRelationDAO repositoryEntryRelationDao;
@@ -747,6 +750,7 @@ public class BusinessGroupServiceImpl implements BusinessGroupService, UserDataD
 			areaManager.deleteBGtoAreaRelations(group);
 			// 3) Delete the relations
 			businessGroupRelationDAO.deleteRelationsToRepositoryEntry(group);
+			assessmentModeMgr.deleteAssessmentModesToGroup(group);
 			// 4) delete properties
 			propertyManager.deleteProperties(null, group, null, null, null);
 			propertyManager.deleteProperties(null, null, group, null, null);