OO-1892: only show the artefact picker if there is an efficiency statement to grab

src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java

@@ -184,7 +184,7 @@ public class CertificateAndEfficiencyStatementController extends BasicController
 			selectCertificate(ureq);
 		}
 		
-		if(statementOwner.equals(ureq.getIdentity())) {
+		if(efficiencyStatement != null && statementOwner.equals(ureq.getIdentity())) {
 			EPArtefactHandler<?> artHandler = portfolioModule.getArtefactHandler(EfficiencyStatementArtefact.ARTEFACT_TYPE);
 			if(portfolioModule.isEnabled() && artHandler != null && artHandler.isEnabled()) {
 				collectArtefactLink = LinkFactory.createCustomLink("collectArtefactLink", "collectartefact", "", Link.NONTRANSLATED, mainVC, this);
@@ -365,7 +365,7 @@ public class CertificateAndEfficiencyStatementController extends BasicController
 			artefact.setAuthor(getIdentity());//only author can create artefact
 			//no business path becouse we cannot launch an efficiency statement
 			artefact.setCollectionDate(new Date());
-			artefact.setTitle(translate("artefact.title", new String[]{efficiencyStatement.getCourseTitle()}));
+			artefact.setTitle(translate("artefact.title", new String[]{ efficiencyStatement.getCourseTitle() }));
 			artHandler.prefillArtefactAccordingToSource(artefact, efficiencyStatement);
 			ePFCollCtrl = new ArtefactWizzardStepsController(ureq, getWindowControl(), artefact, (VFSContainer)null);
 			listenTo(ePFCollCtrl);

src/main/java/org/olat/modules/fo/ui/MessageListController.java

@@ -891,7 +891,7 @@ public class MessageListController extends BasicController implements GenericEve
 				if(reloadedMessage.getParent() == null) {
 					forumManager.deleteMessageTree(forum.getKey(), reloadedMessage);
 					//delete topics
-					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_DELETE, getClass(),
+					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_DELETE, getClass(),
 							LoggingResourceable.wrap(reloadedMessage));
 					//back to thread list
 					fireEvent(ureq, new DeleteThreadEvent());
@@ -905,7 +905,7 @@ public class MessageListController extends BasicController implements GenericEve
 						thread = threadTop;//update with the fresh version
 					}
 					showInfo("deleteok");
-					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_DELETE, getClass(),
+					ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_DELETE, getClass(),
 						LoggingResourceable.wrap(reloadedMessage));
 					//reload
 					reloadModelAfterDelete(ureq, message);