X-Git-Url: https://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=blobdiff_plain;f=org.argeo.suite.web%2Fsrc%2Forg%2Fargeo%2Fsuite%2Fweb%2FDefaultMainPage.java;h=1963e66ec7549778006d1eaac719c03bcaa964ec;hp=d7ae0324669d78c3ab2986b1b0c1ab93942dbc9a;hb=6e9552fe6e273c777449244442769e6de5fe822e;hpb=1cebaaf96f0e34a7995f960e07aa62fb6c5f40b9

diff --git a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
index d7ae032..1963e66 100644
--- a/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
+++ b/org.argeo.suite.web/src/org/argeo/suite/web/DefaultMainPage.java
@@ -16,9 +16,10 @@ import org.argeo.cms.ui.CmsView;
 import org.argeo.cms.ui.LifeCycleUiProvider;
 import org.argeo.cms.util.CmsUtils;
 import org.argeo.cms.widgets.auth.CmsLogin;
+import org.argeo.connect.ConnectTypes;
 import org.argeo.connect.people.PeopleService;
-import org.argeo.connect.people.PeopleTypes;
 import org.argeo.connect.people.web.pages.PeopleDefaultPage;
+import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
 import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
@@ -41,6 +42,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	private CmsUiProvider fsBrowserPage;
 
 	/* DEPENDENCY INJECTION */
+	private ResourcesService resourceService;
 	private PeopleService peopleService;
 	private FileSystemProvider nodeFileSystemProvider;
 	private Map<String, String> peopleIconPaths;
@@ -50,8 +52,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
 	@Override
 	public void init(Session adminSession) throws RepositoryException {
-		dashboardPage = new DefaultDashboard(peopleService, peopleIconPaths);
-		peoplePage = new PeopleDefaultPage(peopleService, peopleIconPaths);
+		dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
+		peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
 		fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
 	}
 
@@ -60,9 +62,9 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 		if (CurrentUser.isAnonymous())
 			return createAnonymousUi(parent, context);
 
-		if (context.isNodeType(PeopleTypes.PEOPLE_ENTITY))
+		if (context.isNodeType(ConnectTypes.CONNECT_ENTITY))
 			return peoplePage.createUi(parent, context);
-		else if (peopleService.getBasePath(null).equals(context.getPath()))
+		else if (peopleService.getDefaultBasePath().equals(context.getPath()))
 			return peoplePage.createUi(parent, context);
 		else if (context.isNodeType(NodeType.NT_FOLDER) || context.isNodeType(NodeType.NT_FILE))
 			return fsBrowserPage.createUi(parent, context);
@@ -121,6 +123,10 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	}
 
 	/* DEPENDENCY INJECTION */
+	public void setResourceService(ResourcesService resourceService) {
+		this.resourceService = resourceService;
+	}
+
 	public void setPeopleService(PeopleService peopleService) {
 		this.peopleService = peopleService;
 	}