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
16308813
Commit
16308813
authored
9 years ago
by
srosse
Browse files
Options
Downloads
Patches
Plain Diff
OO-1728: show a message instead of a red screen if the test in the course element is not defined
parent
da5bec23
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/olat/course/nodes/iq/IQControllerCreatorOlat.java
+19
-11
19 additions, 11 deletions
...ava/org/olat/course/nodes/iq/IQControllerCreatorOlat.java
with
19 additions
and
11 deletions
src/main/java/org/olat/course/nodes/iq/IQControllerCreatorOlat.java
+
19
−
11
View file @
16308813
...
@@ -118,8 +118,8 @@ public class IQControllerCreatorOlat implements IQControllerCreator {
...
@@ -118,8 +118,8 @@ public class IQControllerCreatorOlat implements IQControllerCreator {
Controller
controller
;
Controller
controller
;
// Do not allow guests to start tests
// Do not allow guests to start tests
Roles
roles
=
ureq
.
getUserSession
().
getRoles
();
Roles
roles
=
ureq
.
getUserSession
().
getRoles
();
Translator
trans
=
Util
.
createPackageTranslator
(
IQTESTCourseNode
.
class
,
ureq
.
getLocale
());
if
(
roles
.
isGuestOnly
())
{
if
(
roles
.
isGuestOnly
())
{
Translator
trans
=
Util
.
createPackageTranslator
(
IQTESTCourseNode
.
class
,
ureq
.
getLocale
());
String
title
=
trans
.
translate
(
"guestnoaccess.title"
);
String
title
=
trans
.
translate
(
"guestnoaccess.title"
);
String
message
=
trans
.
translate
(
"guestnoaccess.message"
);
String
message
=
trans
.
translate
(
"guestnoaccess.message"
);
controller
=
MessageUIFactory
.
createInfoMessage
(
ureq
,
wControl
,
title
,
message
);
controller
=
MessageUIFactory
.
createInfoMessage
(
ureq
,
wControl
,
title
,
message
);
...
@@ -132,17 +132,25 @@ public class IQControllerCreatorOlat implements IQControllerCreator {
...
@@ -132,17 +132,25 @@ public class IQControllerCreatorOlat implements IQControllerCreator {
AssessmentManager
am
=
userCourseEnv
.
getCourseEnvironment
().
getAssessmentManager
();
AssessmentManager
am
=
userCourseEnv
.
getCourseEnvironment
().
getAssessmentManager
();
IQSecurityCallback
sec
=
new
CourseIQSecurityCallback
(
courseNode
,
am
,
ureq
.
getIdentity
());
IQSecurityCallback
sec
=
new
CourseIQSecurityCallback
(
courseNode
,
am
,
ureq
.
getIdentity
());
RepositoryEntry
repositoryEntry
=
courseNode
.
getReferencedRepositoryEntry
();
RepositoryEntry
repositoryEntry
=
courseNode
.
getReferencedRepositoryEntry
();
OLATResourceable
ores
=
repositoryEntry
.
getOlatResource
();
if
(
repositoryEntry
==
null
)
{
Long
resId
=
ores
.
getResourceableId
();
Translator
trans
=
Util
.
createPackageTranslator
(
IQControllerCreatorOlat
.
class
,
ureq
.
getLocale
());
TestFileResource
fr
=
new
TestFileResource
();
String
title
=
trans
.
translate
(
"error.test.undefined.short"
,
new
String
[]{
courseNode
.
getShortTitle
()
});
fr
.
overrideResourceableId
(
resId
);
String
message
=
trans
.
translate
(
"error.test.undefined.long"
,
new
String
[]{
courseNode
.
getShortTitle
()
});
if
(!
CoordinatorManager
.
getInstance
().
getCoordinator
().
getLocker
().
isLocked
(
fr
,
null
))
{
//QTI1
controller
=
new
IQRunController
(
userCourseEnv
,
courseNode
.
getModuleConfiguration
(),
sec
,
ureq
,
wControl
,
courseNode
);
}
else
{
String
title
=
trans
.
translate
(
"editor.lock.title"
);
String
message
=
trans
.
translate
(
"editor.lock.message"
);
controller
=
MessageUIFactory
.
createInfoMessage
(
ureq
,
wControl
,
title
,
message
);
controller
=
MessageUIFactory
.
createInfoMessage
(
ureq
,
wControl
,
title
,
message
);
}
else
{
OLATResourceable
ores
=
repositoryEntry
.
getOlatResource
();
Long
resId
=
ores
.
getResourceableId
();
TestFileResource
fr
=
new
TestFileResource
();
fr
.
overrideResourceableId
(
resId
);
if
(!
CoordinatorManager
.
getInstance
().
getCoordinator
().
getLocker
().
isLocked
(
fr
,
null
))
{
//QTI1
controller
=
new
IQRunController
(
userCourseEnv
,
courseNode
.
getModuleConfiguration
(),
sec
,
ureq
,
wControl
,
courseNode
);
}
else
{
Translator
trans
=
Util
.
createPackageTranslator
(
IQTESTCourseNode
.
class
,
ureq
.
getLocale
());
String
title
=
trans
.
translate
(
"editor.lock.title"
);
String
message
=
trans
.
translate
(
"editor.lock.message"
);
controller
=
MessageUIFactory
.
createInfoMessage
(
ureq
,
wControl
,
title
,
message
);
}
}
}
}
}
}
}
...
...
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