Skip to content
Snippets Groups Projects
Commit c26c5667 authored by srosse's avatar srosse
Browse files

OO-1016: better debugging of e-mails, don't send user info to factory for drop...

OO-1016: better debugging of e-mails, don't send user info to factory for drop box subscription's context
parent 4a18855a
No related branches found
No related tags found
No related merge requests found
...@@ -1618,6 +1618,13 @@ public class MailManagerImpl extends BasicManager implements MailManager { ...@@ -1618,6 +1618,13 @@ public class MailManagerImpl extends BasicManager implements MailManager {
} }
} }
Transport.send(msg); Transport.send(msg);
} else if(Settings.isDebuging() && result.getReturnCode() == MailerResult.OK) {
try {
logInfo("E-mail send: " + msg.getSubject());
logInfo("Content : " + msg.getContent());
} catch (IOException e) {
logError("", e);
}
} else { } else {
result.setReturnCode(MailerResult.MAILHOST_UNDEFINED); result.setReturnCode(MailerResult.MAILHOST_UNDEFINED);
} }
......
...@@ -145,12 +145,13 @@ public class DropboxController extends BasicController { ...@@ -145,12 +145,13 @@ public class DropboxController extends BasicController {
myContent.contextPut("previewMode", previewMode ? Boolean.TRUE : Boolean.FALSE); myContent.contextPut("previewMode", previewMode ? Boolean.TRUE : Boolean.FALSE);
// notification // notification
CourseEnvironment courseEnv = userCourseEnv.getCourseEnvironment();
subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(courseEnv, node);
if ( hasNotification && !previewMode) { if ( hasNotification && !previewMode) {
// offer subscription, but not to guests // offer subscription, but not to guests
subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(userCourseEnv, node);
if (subsContext != null) { if (subsContext != null) {
contextualSubscriptionCtr = AbstractTaskNotificationHandler.createContextualSubscriptionController(ureq, wControl, getDropboxPathRelToFolderRoot( String path = getDropboxPathRelToFolderRoot(courseEnv, node);
userCourseEnv.getCourseEnvironment(), node), subsContext, DropboxController.class); contextualSubscriptionCtr = AbstractTaskNotificationHandler.createContextualSubscriptionController(ureq, wControl, path, subsContext, DropboxController.class);
myContent.put("subscription", contextualSubscriptionCtr.getInitialComponent()); myContent.put("subscription", contextualSubscriptionCtr.getInitialComponent());
myContent.contextPut("hasNotification", Boolean.TRUE); myContent.contextPut("hasNotification", Boolean.TRUE);
} }
...@@ -243,7 +244,7 @@ public class DropboxController extends BasicController { ...@@ -243,7 +244,7 @@ public class DropboxController extends BasicController {
VFSLeaf fOut; VFSLeaf fOut;
if (fDropbox.resolve(fIn.getName()) != null) { if (fDropbox.resolve(fIn.getName()) != null) {
//FIXME ms: check if dropbox quota is exceeded -> with customers abkl�ren //FIXME ms: check if dropbox quota is exceeded -> clarify with customers
fOut = fDropbox.createChildLeaf(getNewUniqueName(fIn.getName())); fOut = fDropbox.createChildLeaf(getNewUniqueName(fIn.getName()));
} else { } else {
fOut = fDropbox.createChildLeaf(fIn.getName()); fOut = fDropbox.createChildLeaf(fIn.getName());
...@@ -308,7 +309,6 @@ public class DropboxController extends BasicController { ...@@ -308,7 +309,6 @@ public class DropboxController extends BasicController {
} }
} }
subsContext = DropboxFileUploadNotificationHandler.getSubscriptionContext(userCourseEnv, node);
// inform subscription manager about new element // inform subscription manager about new element
if (subsContext != null) { if (subsContext != null) {
NotificationsManager.getInstance().markPublisherNews(subsContext, ureq.getIdentity(), true); NotificationsManager.getInstance().markPublisherNews(subsContext, ureq.getIdentity(), true);
......
...@@ -31,7 +31,7 @@ import org.olat.core.logging.OLog; ...@@ -31,7 +31,7 @@ import org.olat.core.logging.OLog;
import org.olat.core.logging.Tracing; import org.olat.core.logging.Tracing;
import org.olat.course.CourseModule; import org.olat.course.CourseModule;
import org.olat.course.nodes.CourseNode; import org.olat.course.nodes.CourseNode;
import org.olat.course.run.userview.UserCourseEnvironment; import org.olat.course.run.environment.CourseEnvironment;
/** /**
* Description:<br> * Description:<br>
...@@ -51,8 +51,8 @@ public class DropboxFileUploadNotificationHandler extends AbstractTaskNotificati ...@@ -51,8 +51,8 @@ public class DropboxFileUploadNotificationHandler extends AbstractTaskNotificati
//empty block //empty block
} }
protected static SubscriptionContext getSubscriptionContext(UserCourseEnvironment userCourseEnv, CourseNode node) { protected static SubscriptionContext getSubscriptionContext(CourseEnvironment courseEnv, CourseNode node) {
return CourseModule.createSubscriptionContext(userCourseEnv.getCourseEnvironment(), node, node.getIdent()); return CourseModule.createSubscriptionContext(courseEnv, node, node.getIdent());
} }
protected String getCssClassIcon() { protected String getCssClassIcon() {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment