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

Merge OpenOLAT 12.1 to OpenOLAT default branch with ea839381f1e107b7130e48f3b9e9d63465bd7eed

parents c70b3b24 80244001
No related branches found
No related tags found
No related merge requests found
......@@ -199,3 +199,4 @@ cd13b2d55dde9f3f3ba9f31e10f9d02493740891 OpenOLAT 12.1.0
7889575e549c06a491840f62134afa065afb50ae OpenOLAT 12.1.1
eb6b3df62c5f776cc86dd5221bdf2fea9a87d9cb OpenOLAT 12.1.2
8de46abaab44970cafb8da0f434bb87cb4fa2171 OpenOLAT 12.1.3
ab9ccd741d6bd63290f94454b3136341a1031eef OpenOLAT 12.1.4
......@@ -419,13 +419,16 @@ public class TeacherRollCallController extends FormBasicController {
for(int i=tableModel.getRowCount(); i-->0; ) {
TeacherRollCallRow row = tableModel.getObject(i);
row.getAuthorizedAbsence().clearError();
if(row.getAuthorizedAbsence() != null) {
row.getAuthorizedAbsence().clearError();
}
if(row.getRollCall() == null) {
//??? stop?
} else if(!absenceDefaultAuthorized) {
String reason = row.getRollCall().getAbsenceReason();
if(row.getAuthorizedAbsence().isAtLeastSelected(1) && !StringHelper.containsNonWhitespace(reason)) {
if(row.getAuthorizedAbsence() != null && row.getAuthorizedAbsence().isAtLeastSelected(1) && !StringHelper.containsNonWhitespace(reason)) {
row.getAuthorizedAbsence().setErrorKey("error.reason.mandatory", null);
allOk &= false;
}
......
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