Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
OLAT CI-CD Testing Project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Requirements
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Lars Oliver Dam
OLAT CI-CD Testing Project
Commits
141f02d5
Commit
141f02d5
authored
7 years ago
by
srosse
Browse files
Options
Downloads
Plain Diff
Merge OpenOLAT 12.1 to OpenOLAT default branch with ea839381f1e107b7130e48f3b9e9d63465bd7eed
parents
c70b3b24
80244001
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
.hgtags
+1
-0
1 addition, 0 deletions
.hgtags
src/main/java/org/olat/modules/lecture/ui/TeacherRollCallController.java
+5
-2
5 additions, 2 deletions
...rg/olat/modules/lecture/ui/TeacherRollCallController.java
with
6 additions
and
2 deletions
.hgtags
+
1
−
0
View file @
141f02d5
...
...
@@ -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
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/modules/lecture/ui/TeacherRollCallController.java
+
5
−
2
View file @
141f02d5
...
...
@@ -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
;
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment