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=b84a653d654e62ca62c7206d5baee685f6e8b42c;hp=6c4c74e8fdfb7b73c088cda7489b90439fb907cc;hb=c2c976b0116644bdfccffa6504e4ee598c9dcc58;hpb=aa4589e3623bd00210ce1a9f56153beee45e6c1d

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 6c4c74e..b84a653 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,11 +16,13 @@ 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.people.PeopleService;
-import org.argeo.connect.people.PeopleTypes;
-import org.argeo.connect.people.web.pages.PeopleDefaultPage;
-import org.argeo.connect.resources.ResourceService;
+import org.argeo.connect.AppMaintenanceService;
+import org.argeo.connect.ConnectTypes;
+import org.argeo.connect.resources.ResourcesService;
 import org.argeo.eclipse.ui.EclipseUiUtils;
+import org.argeo.people.PeopleService;
+import org.argeo.people.PeopleTypes;
+import org.argeo.people.web.pages.PeopleDefaultPage;
 import org.argeo.suite.web.fs.MyFilesBrowserPage;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.SelectionListener;
@@ -42,7 +44,7 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	private CmsUiProvider fsBrowserPage;
 
 	/* DEPENDENCY INJECTION */
-	private ResourceService resourceService;
+	private ResourcesService resourcesService;
 	private PeopleService peopleService;
 	private FileSystemProvider nodeFileSystemProvider;
 	private Map<String, String> peopleIconPaths;
@@ -52,8 +54,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 
 	@Override
 	public void init(Session adminSession) throws RepositoryException {
-		dashboardPage = new DefaultDashboard(resourceService, peopleService, peopleIconPaths);
-		peoplePage = new PeopleDefaultPage(resourceService, peopleService, peopleIconPaths);
+		dashboardPage = new DefaultDashboard(resourcesService, peopleService, peopleIconPaths);
+		peoplePage = new PeopleDefaultPage(resourcesService, peopleService, peopleIconPaths);
 		fsBrowserPage = new MyFilesBrowserPage(nodeFileSystemProvider);
 	}
 
@@ -62,9 +64,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.getBaseRelPath(PeopleTypes.PEOPLE_PERSON)).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);
@@ -123,8 +125,8 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	}
 
 	/* DEPENDENCY INJECTION */
-	public void setResourceService(ResourceService resourceService) {
-		this.resourceService = resourceService;
+	public void setResourcesService(ResourcesService resourcesService) {
+		this.resourcesService = resourcesService;
 	}
 
 	public void setPeopleService(PeopleService peopleService) {
@@ -138,4 +140,9 @@ public class DefaultMainPage implements LifeCycleUiProvider {
 	public void setPeopleIconPaths(Map<String, String> peopleIconPaths) {
 		this.peopleIconPaths = peopleIconPaths;
 	}
+
+	// Only used has a blocker.
+	public void setSuiteMaintenanceService(AppMaintenanceService suiteMaintenanceService) {
+	}
+
 }