Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
openolat
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Contributor analytics
Repository analytics
Insights
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
Zentraler Informatikdienst
Digitale Medien und Lerntechnologien
olat
openolat
Commits
5bc57bb5
Commit
5bc57bb5
authored
5 years ago
by
uhensler
Browse files
Options
Downloads
Plain Diff
Merge branch 'OpenOLAT_14.0' into OpenOLAT_14.1
parents
b986a0a8
af3792e3
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
src/main/java/org/olat/course/nodes/SurveyCourseNode.java
+1
-1
1 addition, 1 deletion
src/main/java/org/olat/course/nodes/SurveyCourseNode.java
src/main/java/org/olat/course/nodes/survey/SurveyRunController.java
+1
-2
1 addition, 2 deletions
...ava/org/olat/course/nodes/survey/SurveyRunController.java
with
2 additions
and
3 deletions
src/main/java/org/olat/course/nodes/SurveyCourseNode.java
+
1
−
1
View file @
5bc57bb5
...
...
@@ -251,7 +251,7 @@ public class SurveyCourseNode extends AbstractAccessableCourseNode {
RepositoryEntry
ores
=
RepositoryManager
.
getInstance
().
lookupRepositoryEntry
(
course
,
true
);
EvaluationFormManager
evaluationFormManager
=
CoreSpringFactory
.
getImpl
(
EvaluationFormManager
.
class
);
RepositoryEntry
formEntry
=
getEvaluationForm
(
getModuleConfiguration
());
EvaluationFormSurveyIdentifier
surveyIdent
=
of
(
ores
,
get
Ident
()
);
EvaluationFormSurveyIdentifier
surveyIdent
=
of
(
ores
,
node
Ident
);
EvaluationFormSurvey
survey
=
evaluationFormManager
.
loadSurvey
(
surveyIdent
);
if
(
survey
==
null
)
{
survey
=
evaluationFormManager
.
createSurvey
(
surveyIdent
,
formEntry
);
...
...
This diff is collapsed.
Click to expand it.
src/main/java/org/olat/course/nodes/survey/SurveyRunController.java
+
1
−
2
View file @
5bc57bb5
...
...
@@ -45,7 +45,6 @@ import org.olat.course.assessment.AssessmentManager;
import
org.olat.course.nodes.SurveyCourseNode
;
import
org.olat.course.run.userview.UserCourseEnvironment
;
import
org.olat.modules.assessment.Role
;
import
org.olat.modules.card2brain.manager.Card2BrainManagerImpl
;
import
org.olat.modules.forms.EvaluationFormManager
;
import
org.olat.modules.forms.EvaluationFormParticipation
;
import
org.olat.modules.forms.EvaluationFormParticipationIdentifier
;
...
...
@@ -62,7 +61,7 @@ import org.springframework.beans.factory.annotation.Autowired;
*/
public
class
SurveyRunController
extends
BasicController
{
private
static
final
Logger
log
=
Tracing
.
createLoggerFor
(
Card2BrainManagerImpl
.
class
);
private
static
final
Logger
log
=
Tracing
.
createLoggerFor
(
SurveyRunController
.
class
);
private
VelocityContainer
mainVC
;
private
Link
resetLink
;
...
...
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