diff --git a/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java b/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java index bc0ef488e..96a02d5ed 100755 --- a/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java +++ b/services/src/main/java/org/exoplatform/task/integration/notification/AbstractNotificationPlugin.java @@ -139,7 +139,7 @@ protected Set getReceiver(TaskDto task, NotificationContext ctx) { } protected String getPortalOwner() { - return CommonsUtils.getService(UserPortalConfigService.class).getDefaultPortal(); + return CommonsUtils.getService(UserPortalConfigService.class).getMetaPortal(); } private String buildTaskUrl(TaskDto t, ExoContainer container, WebAppController controller) { diff --git a/services/src/main/java/org/exoplatform/task/util/ResourceUtil.java b/services/src/main/java/org/exoplatform/task/util/ResourceUtil.java index cbd87cac2..c16f99234 100644 --- a/services/src/main/java/org/exoplatform/task/util/ResourceUtil.java +++ b/services/src/main/java/org/exoplatform/task/util/ResourceUtil.java @@ -31,21 +31,16 @@ import org.exoplatform.container.ExoContainer; import org.exoplatform.container.ExoContainerContext; import org.exoplatform.container.PortalContainer; -import org.exoplatform.portal.application.PortalRequestContext; -import org.exoplatform.portal.application.RequestNavigationData; import org.exoplatform.portal.config.UserPortalConfigService; import org.exoplatform.portal.mop.SiteKey; import org.exoplatform.portal.mop.SiteType; import org.exoplatform.portal.mop.navigation.NavigationContext; -import org.exoplatform.portal.mop.navigation.NavigationService; import org.exoplatform.portal.mop.navigation.NodeContext; import org.exoplatform.portal.mop.navigation.NodeModel; import org.exoplatform.portal.mop.navigation.Scope; -import org.exoplatform.portal.webui.util.Util; -import org.exoplatform.social.common.router.ExoRouter; +import org.exoplatform.portal.mop.service.NavigationService; import org.exoplatform.social.core.space.SpaceUtils; import org.exoplatform.social.core.space.model.Space; -import org.exoplatform.social.core.space.spi.SpaceService; import org.exoplatform.web.WebAppController; import org.exoplatform.web.controller.QualifiedName; import org.exoplatform.web.controller.router.Router; @@ -121,7 +116,7 @@ public static String buildBaseURL() { Space space = null; WebuiRequestContext context = WebuiRequestContext.getCurrentInstance(); if (context == null) { - siteKey = SiteKey.portal(portalConfigService.getDefaultPortal()); + siteKey = SiteKey.portal(portalConfigService.getMetaPortal()); } else { siteKey = CommonsUtils.getCurrentSite(); space = SpaceUtils.getSpaceByContext();