Merge branch 'OpenOLAT_15.1' of...

Merge branch 'OpenOLAT_15.1' of ssh://srosse@office.frentix.com/home/srosse/repositories/OpenOLAT.git into OpenOLAT_15.1

src/main/java/org/olat/core/commons/services/help/HelpModule.java

@@ -819,7 +819,10 @@ public class HelpModule extends AbstractSpringModule {
 		String enabled = usertool ? USERTOOL : "";
 		enabled += authorsite ? DELIMITER + AUTHORSITE : "";
 		enabled += login ? DELIMITER + DMZ : "";
-
+		// remove trailing delimiter
+		if (enabled.startsWith(DELIMITER)) {
+			enabled = enabled.substring(DELIMITER.length());
+		}
 		return enabled;
 	}
 	
@@ -892,7 +895,10 @@ public class HelpModule extends AbstractSpringModule {
 	 */
 	private void addToHelpPlugins(String plugin) {
 		if (!helpPlugins.contains(plugin)) {
-			helpPlugins += DELIMITER + plugin;
+			if (helpPlugins.length() > 0) {
+				helpPlugins += DELIMITER;				
+			}
+			helpPlugins += plugin;
 			setStringProperty("help.plugin", helpPlugins, true);
 		}
 	}

src/main/java/org/olat/course/assessment/manager/CourseMembershipProcessor.java

@@ -30,6 +30,7 @@ import org.olat.basesecurity.BaseSecurity;
 import org.olat.basesecurity.GroupRoles;
 import org.olat.basesecurity.IdentityRef;
 import org.olat.basesecurity.model.IdentityRefImpl;
+import org.olat.core.commons.persistence.DB;
 import org.olat.core.gui.control.Event;
 import org.olat.core.id.Identity;
 import org.olat.core.id.IdentityEnvironment;
@@ -70,6 +71,8 @@ public class CourseMembershipProcessor implements GenericEventListener {
 
 	private static final Logger log = Tracing.createLoggerFor(CourseMembershipProcessor.class);
 	
+	@Autowired
+	private DB dbInstance;
 	@Autowired
 	private BaseSecurity securityManager;
 	@Autowired
@@ -235,6 +238,7 @@ public class CourseMembershipProcessor implements GenericEventListener {
 		UserCourseEnvironment userCourseEnv = new UserCourseEnvironmentImpl(identityEnv, courseEnv);
 		userCourseEnv.getScoreAccounting().evaluateAll(true);
 		log.debug("Evaluated all assessment entries of {} in {}", identity, courseEntry);
+		dbInstance.commitAndCloseSession();
 	}
 	
 }

src/main/resources/serviceconfig/olat.properties

@@ -423,10 +423,10 @@ certificate.linemanager=false
 # your own help plugin and configure it here.
 help.enabled=true
 # Define the plugin which generate the help URL
-help.plugin=ooConfluenceLinkHelp,ooAcademyLinkHelp
-help.plugin.values=ooConfluenceLinkHelp,ooAcademyLinkHelp,supportMailHelp,courseHelp,customLink1Help,customLink2Help
+help.plugin=ooConfluenceLinkHelp,ooAcademyLinkHelp,ooTeachLinkHelp
+help.plugin.values=ooConfluenceLinkHelp,ooAcademyLinkHelp,ooTeachLinkHelp,supportMailHelp,courseHelp,customLink1Help,customLink2Help,customLink3Help
 # Note that when you use anything but ooConfluenceLinkHelp, the context help will be disabled. Only the help button in the top navigation will be available and open the help course
-help.plugin.icon.values=o_icon_manual,o_icon_video,o_course_icon,o_icon_mail or any other icon
+help.plugin.icon.values=o_icon_manual,o_icon_video,o_icon_coach,o_course_icon,o_icon_mail or any other icon
 
 # Settings for the ooConfluenceLinkHelp plugin 
 help.confluence.enabled=usertool,authorsite,dmz
@@ -440,7 +440,7 @@ help.academy.icon=o_icon_video
 # Settings for the ooTeachLinkHelp plugin 
 help.ooteach.link=https://www.openolat.com/openolat-teach/
 help.ooteach.enabled=authorsite
-help.ooteach.icon=o_icon_video
+help.ooteach.icon=o_icon_coach
 
 # Settings for the supportMailHelp plugin 
 help.support.email=${supportemail}