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

OO-2862: open the visiting card

parent 57e9a3d8
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,7 @@ import java.util.Set; ...@@ -30,6 +30,7 @@ import java.util.Set;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.olat.basesecurity.BaseSecurityModule; import org.olat.basesecurity.BaseSecurityModule;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
import org.olat.core.commons.modules.bc.meta.MetaInfo; import org.olat.core.commons.modules.bc.meta.MetaInfo;
import org.olat.core.commons.modules.bc.meta.tagged.MetaTagged; import org.olat.core.commons.modules.bc.meta.tagged.MetaTagged;
import org.olat.core.commons.persistence.DBFactory; import org.olat.core.commons.persistence.DBFactory;
...@@ -47,10 +48,12 @@ import org.olat.core.gui.control.Controller; ...@@ -47,10 +48,12 @@ import org.olat.core.gui.control.Controller;
import org.olat.core.gui.control.Event; import org.olat.core.gui.control.Event;
import org.olat.core.gui.control.WindowControl; import org.olat.core.gui.control.WindowControl;
import org.olat.core.gui.control.controller.BasicController; import org.olat.core.gui.control.controller.BasicController;
import org.olat.core.gui.control.creator.ControllerCreator;
import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController; import org.olat.core.gui.control.generic.closablewrapper.CloseableModalController;
import org.olat.core.gui.control.generic.dtabs.Activateable2; import org.olat.core.gui.control.generic.dtabs.Activateable2;
import org.olat.core.gui.control.generic.modal.DialogBoxController; import org.olat.core.gui.control.generic.modal.DialogBoxController;
import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory; import org.olat.core.gui.control.generic.modal.DialogBoxUIFactory;
import org.olat.core.gui.control.generic.popup.PopupBrowserWindow;
import org.olat.core.gui.control.generic.wizard.Step; import org.olat.core.gui.control.generic.wizard.Step;
import org.olat.core.gui.control.generic.wizard.StepRunnerCallback; import org.olat.core.gui.control.generic.wizard.StepRunnerCallback;
import org.olat.core.gui.control.generic.wizard.StepsMainRunController; import org.olat.core.gui.control.generic.wizard.StepsMainRunController;
...@@ -109,6 +112,7 @@ import org.olat.repository.RepositoryEntry; ...@@ -109,6 +112,7 @@ import org.olat.repository.RepositoryEntry;
import org.olat.repository.RepositoryManager; import org.olat.repository.RepositoryManager;
import org.olat.resource.OLATResourceManager; import org.olat.resource.OLATResourceManager;
import org.olat.user.DisplayPortraitController; import org.olat.user.DisplayPortraitController;
import org.olat.user.UserInfoMainController;
import org.olat.user.UserManager; import org.olat.user.UserManager;
import org.olat.user.propertyhandlers.UserPropertyHandler; import org.olat.user.propertyhandlers.UserPropertyHandler;
import org.olat.util.logging.activity.LoggingResourceable; import org.olat.util.logging.activity.LoggingResourceable;
...@@ -645,7 +649,7 @@ public class MessageListController extends BasicController implements GenericEve ...@@ -645,7 +649,7 @@ public class MessageListController extends BasicController implements GenericEve
// Add link with username that is clickable // Add link with username that is clickable
String creatorFullName = StringHelper.escapeHtml(UserManager.getInstance().getUserDisplayName(creator)); String creatorFullName = StringHelper.escapeHtml(UserManager.getInstance().getUserDisplayName(creator));
Link visitingCardLink = LinkFactory.createCustomLink("vc_".concat(keyString), "vc", creatorFullName, Link.LINK_CUSTOM_CSS + Link.NONTRANSLATED, mainVC, this); Link visitingCardLink = LinkFactory.createCustomLink("vc_".concat(keyString), "vc", creatorFullName, Link.LINK_CUSTOM_CSS + Link.NONTRANSLATED, mainVC, this);
visitingCardLink.setUserObject(messageView); visitingCardLink.setUserObject(creator);
LinkPopupSettings settings = new LinkPopupSettings(800, 600, "_blank"); LinkPopupSettings settings = new LinkPopupSettings(800, 600, "_blank");
visitingCardLink.setPopup(settings); visitingCardLink.setPopup(settings);
} }
...@@ -777,7 +781,6 @@ public class MessageListController extends BasicController implements GenericEve ...@@ -777,7 +781,6 @@ public class MessageListController extends BasicController implements GenericEve
Link link = (Link)source; Link link = (Link)source;
String command = link.getCommand(); String command = link.getCommand();
Object uobject = link.getUserObject(); Object uobject = link.getUserObject();
if (command.startsWith("qt")) { if (command.startsWith("qt")) {
doReply(ureq, (MessageView)uobject, true); doReply(ureq, (MessageView)uobject, true);
} else if (command.startsWith("rp")) { } else if (command.startsWith("rp")) {
...@@ -792,6 +795,8 @@ public class MessageListController extends BasicController implements GenericEve ...@@ -792,6 +795,8 @@ public class MessageListController extends BasicController implements GenericEve
doMoveMessage(ureq, (MessageView)uobject); doMoveMessage(ureq, (MessageView)uobject);
} else if (command.startsWith("exile")) { } else if (command.startsWith("exile")) {
doExportForumItem(ureq, (MessageView)uobject); doExportForumItem(ureq, (MessageView)uobject);
} else if(command.equals("vc")) {
doOpenVisitingCard(ureq, (Identity)uobject);
} }
} else if(mainVC == source) { } else if(mainVC == source) {
String cmd = event.getCommand(); String cmd = event.getCommand();
...@@ -1418,6 +1423,19 @@ public class MessageListController extends BasicController implements GenericEve ...@@ -1418,6 +1423,19 @@ public class MessageListController extends BasicController implements GenericEve
} }
} }
private void doOpenVisitingCard(UserRequest ureq, Identity creator) {
ControllerCreator userInfoMainControllerCreator = new ControllerCreator() {
@Override
public Controller createController(UserRequest lureq, WindowControl lwControl) {
return new UserInfoMainController(lureq, lwControl, creator, true, false);
}
};
//wrap the content controller into a full header layout
ControllerCreator layoutCtrlr = BaseFullWebappPopupLayoutFactory.createAuthMinimalPopupLayout(ureq, userInfoMainControllerCreator);
PopupBrowserWindow pbw = getWindowControl().getWindowBackOffice().getWindowManager().createNewPopupBrowserWindowFor(ureq, layoutCtrlr);
pbw.open(ureq);
}
public enum LoadMode { public enum LoadMode {
thread, thread,
userMessages, userMessages,
......
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