From b4117c537bdda000f3cdcc5418f4192459823159 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 4 Feb 2015 21:43:54 +0100
Subject: [PATCH] OO-1349: block leave course link during assessment, deselect
checkbox of the list after delete
---
.../olat/course/assessment/ui/AssessmentModeListController.java | 1 +
src/main/java/org/olat/course/run/CourseRuntimeController.java | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/main/java/org/olat/course/assessment/ui/AssessmentModeListController.java b/src/main/java/org/olat/course/assessment/ui/AssessmentModeListController.java
index ae8ff80ca6f..3e9222b74cf 100644
--- a/src/main/java/org/olat/course/assessment/ui/AssessmentModeListController.java
+++ b/src/main/java/org/olat/course/assessment/ui/AssessmentModeListController.java
@@ -258,6 +258,7 @@ public class AssessmentModeListController extends FormBasicController implements
assessmentModeMgr.delete(modeToDelete);
}
loadModel();
+ tableEl.deselectAll();
}
private void doEdit(UserRequest ureq, AssessmentMode mode) {
diff --git a/src/main/java/org/olat/course/run/CourseRuntimeController.java b/src/main/java/org/olat/course/run/CourseRuntimeController.java
index 308e271ae2f..4c0e3535f1b 100644
--- a/src/main/java/org/olat/course/run/CourseRuntimeController.java
+++ b/src/main/java/org/olat/course/run/CourseRuntimeController.java
@@ -564,6 +564,7 @@ public class CourseRuntimeController extends RepositoryEntryRuntimeController im
}
if(repositoryService.isParticipantAllowedToLeave(getRepositoryEntry())
+ && !assessmentLock
&& (uce.isParticipant() || !uce.getParticipatingGroups().isEmpty())) {
leaveLink = LinkFactory.createToolLink("sign.out", "leave", translate("sign.out"), this);
leaveLink.setIconLeftCSS("o_icon o_icon-fw o_icon_sign_out");
--
GitLab