From 499ae4b15db0b317dd3d572ef90f8a325631c673 Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Wed, 10 Feb 2016 08:54:34 +0100
Subject: [PATCH] OO-1892: only show the artefact picker if there is an
efficiency statement to grab
---
.../ui/CertificateAndEfficiencyStatementController.java | 4 ++--
.../java/org/olat/modules/fo/ui/MessageListController.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java b/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java
index ce5df2ab913..ab44c75e8b6 100644
--- a/src/main/java/org/olat/course/certificate/ui/CertificateAndEfficiencyStatementController.java
+++ b/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);
diff --git a/src/main/java/org/olat/modules/fo/ui/MessageListController.java b/src/main/java/org/olat/modules/fo/ui/MessageListController.java
index 48ffe04f6d3..be468487779 100644
--- a/src/main/java/org/olat/modules/fo/ui/MessageListController.java
+++ b/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);
--
GitLab