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

OO-1781: fix last forum selenium test

parent 75c9ceed
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 77 additions and 22 deletions
src/main/java/org/olat/modules/fo/ForumChangedEvent.java
+ 16
− 1
View file @ 9fda04e5
......@@ -24,6 +24,7 @@
*/
package org.olat.modules.fo;
import org.olat.core.id.Identity;
import org.olat.core.util.event.MultiUserEvent;
/**
......@@ -47,14 +48,20 @@ public class ForumChangedEvent extends MultiUserEvent {
public static final String SHOW = "show";
public static final String NEW = "new";
public static final String STICKY = "sticky";
public static final String NEW_MESSAGE = "new-message";
public static final String CHANGED_MESSAGE = "changed-message";
private Long threadtopKey;
private Long messageKey;
private Long sendByIdentityKey;
public ForumChangedEvent(String command, Long threadtopKey, Long messageKey) {
public ForumChangedEvent(String command, Long threadtopKey, Long messageKey, Identity sendByIdentity) {
super(command);
this.threadtopKey = threadtopKey;
this.messageKey = messageKey;
if(sendByIdentity != null) {
this.sendByIdentityKey = sendByIdentity.getKey();
}
}
public Long getThreadtopKey() {
......@@ -64,4 +71,12 @@ public class ForumChangedEvent extends MultiUserEvent {
public Long getMessageKey() {
return messageKey;
}
public Long getSendByIdentityKey() {
return sendByIdentityKey;
}
public void setSendByIdentityKey(Long sendByIdentityKey) {
this.sendByIdentityKey = sendByIdentityKey;
}
}
src/main/java/org/olat/modules/fo/manager/ForumManager.java
+ 1
− 1
View file @ 9fda04e5
......@@ -857,7 +857,7 @@ public class ForumManager {
}
dbInstance.commit();// before sending async event
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.SPLIT, newTopMessage.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.SPLIT, newTopMessage.getKey(), null, null);
CoordinatorManager.getInstance().getCoordinator().getEventBus()
.fireEventToListenersOf(event, firstMessage.getForum());
}
......
src/main/java/org/olat/modules/fo/ui/ForumController.java
+ 1
− 1
View file @ 9fda04e5
......@@ -191,7 +191,7 @@ public class ForumController extends BasicController implements GenericEventList
if(fce.getMessageKey() == null) {
reloadThreadList = true;
}
}
}
}
@Override
......
src/main/java/org/olat/modules/fo/ui/MessageEditController.java
+ 15
− 5
View file @ 9fda04e5
......@@ -31,6 +31,7 @@ import org.olat.basesecurity.BaseSecurity;
import org.olat.basesecurity.IdentityShort;
import org.olat.core.commons.modules.bc.FolderConfig;
import org.olat.core.commons.modules.bc.vfs.OlatRootFolderImpl;
import org.olat.core.commons.persistence.DBFactory;
import org.olat.core.commons.services.notifications.NotificationsManager;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.form.flexible.FormItem;
......@@ -384,17 +385,18 @@ public class MessageEditController extends FormBasicController {
} else if(message.getCreator() != null && message.getCreator().equals(getIdentity())) {
message.setPseudonym(null);
}
if(editMode == EditMode.newThread) {
if(foCallback.mayOpenNewThread()) {
// save a new thread
fm.addTopMessage(message);
fm.markAsRead(getIdentity(), forum, message);
// if notification is enabled -> notify the publisher about news
notifiySubscription();
addLoggingResourceable(LoggingResourceable.wrap(message));
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.NEW, message.getKey(), null);
//commit before sending events
DBFactory.getInstance().commit();
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.NEW_MESSAGE, message.getKey(), message.getKey(), getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forum);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_CREATE, getClass());
} else {
......@@ -407,8 +409,12 @@ public class MessageEditController extends FormBasicController {
message.setModifier(getIdentity());
message = fm.updateMessage(message, true);
persistTempUploadedFiles(message);
notifiySubscription();
//commit before sending events
DBFactory.getInstance().commit();
Long threadTopKey = message.getThreadtop() == null ? null : message.getThreadtop().getKey();
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.CHANGED_MESSAGE, threadTopKey, message.getKey(), getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forum);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_EDIT, getClass(),
LoggingResourceable.wrap(message));
} else {
......@@ -418,8 +424,12 @@ public class MessageEditController extends FormBasicController {
fm.replyToMessage(message, parentMessage);
fm.markAsRead(getIdentity(), forum, message);
persistTempUploadedFiles(message);
notifiySubscription();
//commit before sending events
DBFactory.getInstance().commit();
Long threadTopKey = message.getThreadtop() == null ? null : message.getThreadtop().getKey();
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.NEW_MESSAGE, threadTopKey, message.getKey(), getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forum);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_REPLY_MESSAGE_CREATE, getClass(),
LoggingResourceable.wrap(message));
}
......
src/main/java/org/olat/modules/fo/ui/MessageListController.java
+ 44
− 14
View file @ 9fda04e5
......@@ -64,6 +64,7 @@ import org.olat.core.util.Formatter;
import org.olat.core.util.StringHelper;
import org.olat.core.util.Util;
import org.olat.core.util.coordinate.CoordinatorManager;
import org.olat.core.util.event.GenericEventListener;
import org.olat.core.util.resource.OresHelper;
import org.olat.core.util.vfs.VFSContainer;
import org.olat.core.util.vfs.VFSItem;
......@@ -98,7 +99,7 @@ import org.springframework.beans.factory.annotation.Autowired;
* @author srosse, stephane.rosse@frentix.com, http://www.frentix.com
*
*/
public class MessageListController extends BasicController {
public class MessageListController extends BasicController implements GenericEventListener {
protected static final String USER_PROPS_ID = ForumUserListController.class.getCanonicalName();
......@@ -116,6 +117,7 @@ public class MessageListController extends BasicController {
private ForumMessageListController moveCtrl, messageTableCtrl;
private Message thread;
private boolean reloadList;
private final Forum forum;
private final boolean guestOnly;
......@@ -166,6 +168,14 @@ public class MessageListController extends BasicController {
putInitialPanel(mainVC);
initButtons();
// Register for forum events
CoordinatorManager.getInstance().getCoordinator().getEventBus().registerFor(this, getIdentity(), forum);
}
@Override
protected void doDispose() {
CoordinatorManager.getInstance().getCoordinator().getEventBus().deregisterFor(this, forum);
}
private void initButtons() {
......@@ -240,6 +250,7 @@ public class MessageListController extends BasicController {
}
private void reloadModel(UserRequest ureq, Message message) {
reloadList = false;
if(loadMode == LoadMode.thread) {
loadThread(ureq, thread);
scrollTo(message);
......@@ -602,8 +613,18 @@ public class MessageListController extends BasicController {
}
@Override
protected void doDispose() {
//
public void event(Event event) {
if(event instanceof ForumChangedEvent) {
ForumChangedEvent fce = (ForumChangedEvent)event;
if(ForumChangedEvent.CHANGED_MESSAGE.equals(fce.getCommand()) || ForumChangedEvent.NEW_MESSAGE.equals(fce.getCommand())) {
Long threadtopKey = fce.getThreadtopKey();
Long senderId = fce.getSendByIdentityKey();
if(thread != null && threadtopKey != null && thread.getKey().equals(threadtopKey)
&& (senderId == null || !senderId.equals(getIdentity().getKey()))) {
reloadList = true;
}
}
}
}
@Override
......@@ -621,11 +642,11 @@ public class MessageListController extends BasicController {
} else if (showThreadButton == source) {
doShowThread();
} else if (allButton == source) {
doShowAll();
doShowAll(ureq);
} else if (allFlatButton == source) {
doShowAllFlat();
doShowAllFlat(ureq);
} else if (oneButton == source) {
doShowOne();
doShowOne(ureq);
} else if (markedButton == source) {
doShowMarked();
} else if (newButton == source) {
......@@ -913,7 +934,7 @@ public class MessageListController extends BasicController {
removeStickyButton.setVisible(status.isSticky() && foCallback.mayEditMessageAsModerator());
mainVC.setDirty(true);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.STICKY, thread.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.STICKY, thread.getKey(), null, getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forumOres);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_MESSAGE_EDIT, getClass(), LoggingResourceable.wrap(thread));
}
......@@ -937,7 +958,7 @@ public class MessageListController extends BasicController {
openThreadButton.setVisible(true && !guestOnly);
mainVC.setDirty(true);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.CLOSE, thread.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.CLOSE, thread.getKey(), null, getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forumOres);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_CLOSE, getClass(), LoggingResourceable.wrap(thread));
}
......@@ -956,7 +977,7 @@ public class MessageListController extends BasicController {
openThreadButton.setVisible(false);
mainVC.setDirty(true);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.OPEN, thread.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.OPEN, thread.getKey(), null, getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forumOres);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_REOPEN, getClass(), LoggingResourceable.wrap(thread));
}
......@@ -981,7 +1002,7 @@ public class MessageListController extends BasicController {
showThreadButton.setVisible(true && !guestOnly);
mainVC.setDirty(true);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.HIDE, thread.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.HIDE, thread.getKey(), null, getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forumOres);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_HIDE, getClass(), LoggingResourceable.wrap(thread));
}
......@@ -1006,27 +1027,36 @@ public class MessageListController extends BasicController {
showThreadButton.setVisible(false);
mainVC.setDirty(true);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.SHOW, thread.getKey(), null);
ForumChangedEvent event = new ForumChangedEvent(ForumChangedEvent.SHOW, thread.getKey(), null, getIdentity());
CoordinatorManager.getInstance().getCoordinator().getEventBus().fireEventToListenersOf(event, forumOres);
ThreadLocalUserActivityLogger.log(ForumLoggingAction.FORUM_THREAD_SHOW, getClass(), LoggingResourceable.wrap(thread));
}
}
private void doShowAll() {
private void doShowAll(UserRequest ureq) {
if(reloadList) {
reloadModel(ureq, null);
}
updateButtons(allButton);
mainVC.contextPut("threadMode", Boolean.TRUE);
mainVC.contextPut("messages", backupViews);
mainVC.contextRemove("mode");
}
private void doShowAllFlat() {
private void doShowAllFlat(UserRequest ureq) {
if(reloadList) {
reloadModel(ureq, null);
}
updateButtons(allFlatButton);
mainVC.contextPut("threadMode", Boolean.FALSE);
mainVC.contextPut("messages", backupViews);
mainVC.contextRemove("mode");
}
private void doShowOne() {
private void doShowOne(UserRequest ureq) {
if(reloadList) {
reloadModel(ureq, null);
}
updateButtons(oneButton);
mainVC.contextPut("mode", "one");
mainVC.contextPut("threadMode", Boolean.FALSE);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment