X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureWorkbenchAdvisor.java;fp=security%2Fplugins%2Forg.argeo.security.ui.rap%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fsecurity%2Fui%2Frap%2FSecureWorkbenchAdvisor.java;h=06a83306db794940db3d05f3e27308b281d4c472;hb=21a7775f246e442c5fa73f16c8e108d81aa0ffd8;hp=072d7de5e9aafcb1d638be1cba4d79d9c9e3ac47;hpb=a4adca31cb63a2900cbb0b0341e0d35643fcbc9e;p=lgpl%2Fargeo-commons.git

diff --git a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureWorkbenchAdvisor.java b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureWorkbenchAdvisor.java
index 072d7de5e..06a83306d 100644
--- a/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureWorkbenchAdvisor.java
+++ b/security/plugins/org.argeo.security.ui.rap/src/main/java/org/argeo/security/ui/rap/SecureWorkbenchAdvisor.java
@@ -1,16 +1,15 @@
 package org.argeo.security.ui.rap;
 
+import org.eclipse.ui.IPerspectiveDescriptor;
 import org.eclipse.ui.application.IWorkbenchWindowConfigurer;
 import org.eclipse.ui.application.WorkbenchAdvisor;
 import org.eclipse.ui.application.WorkbenchWindowAdvisor;
 
 public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
-
-	static final String DEFAULT_PERSPECTIVE_ID = "org.argeo.security.ui.adminSecurityPerspective"; //$NON-NLS-1$
-
+	//static final String DEFAULT_PERSPECTIVE_ID = "org.argeo.security.ui.adminSecurityPerspective"; //$NON-NLS-1$
 	public final static String INITIAL_PERSPECTIVE_PROPERTY = "org.argeo.security.ui.initialPerspective";
 	private String initialPerspective = System.getProperty(
-			INITIAL_PERSPECTIVE_PROPERTY, DEFAULT_PERSPECTIVE_ID);
+			INITIAL_PERSPECTIVE_PROPERTY, null);
 
 	public WorkbenchWindowAdvisor createWorkbenchWindowAdvisor(
 			IWorkbenchWindowConfigurer configurer) {
@@ -18,6 +17,16 @@ public class SecureWorkbenchAdvisor extends WorkbenchAdvisor {
 	}
 
 	public String getInitialWindowPerspectiveId() {
+		if (initialPerspective != null) {
+			// check whether this user can see the declared perspective
+			// (typically the perspective won't be listed if this user doesn't
+			// have the right to see it)
+			IPerspectiveDescriptor pd = getWorkbenchConfigurer().getWorkbench()
+					.getPerspectiveRegistry()
+					.findPerspectiveWithId(initialPerspective);
+			if(pd==null)
+				return null;
+		}
 		return initialPerspective;
 	}
 }