Merge remote-tracking branch 'origin/OpenOLAT_14.1'

src/main/java/org/olat/course/nodes/SurveyCourseNode.java

@@ -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, getIdent());
+		EvaluationFormSurveyIdentifier surveyIdent = of(ores, nodeIdent);
 		EvaluationFormSurvey survey = evaluationFormManager.loadSurvey(surveyIdent);
 		if (survey == null) {
 			survey = evaluationFormManager.createSurvey(surveyIdent, formEntry);

src/main/java/org/olat/course/nodes/survey/SurveyRunController.java

@@ -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;

src/test/java/org/olat/selenium/AssessmentTest.java

@@ -1433,7 +1433,7 @@ public class AssessmentTest extends Deployments {
 		UserVO kanu = new UserRestClient(deploymentUrl).createRandomUser("kanu");
 		UserVO ryomou = new UserRestClient(deploymentUrl).createRandomUser("ryomou");
 
-		LoginPage authorLoginPage = LoginPage.load(ryomouBrowser, deploymentUrl);
+		LoginPage authorLoginPage = LoginPage.load(browser, deploymentUrl);
 		authorLoginPage.loginAs(author.getLogin(), author.getPassword());
 		
 		//create a course