Implemented: "redirect to" last folder opened after re-login
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@100453 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
d5661970be
commit
19921ef10b
|
@ -1,6 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<classpath>
|
<classpath>
|
||||||
<classpathentry kind="src" output="target/workspace-6.6.7-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
<classpathentry kind="src" output="target/workspace-6.6.8-SNAPSHOT/WEB-INF/classes" path="src/main/java">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="optional" value="true"/>
|
<attribute name="optional" value="true"/>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
|
@ -28,5 +28,5 @@
|
||||||
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
|
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
|
||||||
<classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
|
<classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
|
||||||
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
|
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
|
||||||
<classpathentry kind="output" path="target/workspace-6.6.7-SNAPSHOT/WEB-INF/classes"/>
|
<classpathentry kind="output" path="target/workspace-6.6.8-SNAPSHOT/WEB-INF/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
>>>>>>>=.r93212
|
>>>>>>>=.r93212
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
jarsExcludedFromWebInfLib=
|
jarsExcludedFromWebInfLib=
|
||||||
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.7-SNAPSHOT
|
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.8-SNAPSHOT
|
||||||
warSrcDir=src/main/webapp
|
warSrcDir=src/main/webapp
|
||||||
warSrcDirIsOutput=false
|
warSrcDirIsOutput=false
|
||||||
|
|
|
@ -8,6 +8,9 @@
|
||||||
<dependent-module archiveName="workspace-tree-widget-6.6.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
|
<dependent-module archiveName="workspace-tree-widget-6.6.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
|
||||||
<dependency-type>uses</dependency-type>
|
<dependency-type>uses</dependency-type>
|
||||||
</dependent-module>
|
</dependent-module>
|
||||||
|
<dependent-module archiveName="workspace-sharing-widget-1.3.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-sharing-widget/workspace-sharing-widget">
|
||||||
|
<dependency-type>uses</dependency-type>
|
||||||
|
</dependent-module>
|
||||||
|
|
||||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||||
<property name="context-root" value="workspace"/>
|
<property name="context-root" value="workspace"/>
|
||||||
|
|
|
@ -4,6 +4,8 @@ import java.util.ArrayList;
|
||||||
import java.util.Date;
|
import java.util.Date;
|
||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
import java.util.logging.Level;
|
||||||
|
import java.util.logging.Logger;
|
||||||
|
|
||||||
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType;
|
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.ViewSwitchType;
|
||||||
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation;
|
import org.gcube.portlets.user.workspace.client.ConstantsExplorer.WsPortletInitOperation;
|
||||||
|
@ -138,6 +140,7 @@ public class AppController implements SubscriberInterface {
|
||||||
private String selectedSmartFolderId;
|
private String selectedSmartFolderId;
|
||||||
private String selectedSmartFolderCategory;
|
private String selectedSmartFolderCategory;
|
||||||
|
|
||||||
|
public static final Logger logger = Logger.getLogger("WsAppController");
|
||||||
|
|
||||||
|
|
||||||
public AppController(AppControllerExplorer appControllerExplorer) {
|
public AppController(AppControllerExplorer appControllerExplorer) {
|
||||||
|
@ -1615,13 +1618,32 @@ public class AppController implements SubscriberInterface {
|
||||||
@Override
|
@Override
|
||||||
public void viewSessionExpiredPanel() {
|
public void viewSessionExpiredPanel() {
|
||||||
|
|
||||||
/*if(this.rootPanel!=null){
|
FileModel folder = wsPortlet.getGridGroupContainer().getCurrentFolderView();
|
||||||
|
String folderId = "";
|
||||||
|
|
||||||
|
if(folder!=null){
|
||||||
|
folderId = folder.getIdentifier();
|
||||||
|
}else if(wsPortlet.getToolBarPath().getLastParent()!=null){
|
||||||
|
folderId = wsPortlet.getToolBarPath().getLastParent().getIdentifier();
|
||||||
|
}
|
||||||
|
|
||||||
|
logger.log(Level.INFO, "Showing session expired panel, folderId is: "+folderId);
|
||||||
|
|
||||||
|
if(folderId!=null && !folderId.isEmpty()){
|
||||||
|
HashMap<String, String> params = new HashMap<String, String>(1);
|
||||||
|
params.put(ConstantsExplorer.GET_ITEMID_PARAMETER, folderId);
|
||||||
|
logger.log(Level.INFO, "show logut with parameter is: "+folderId);
|
||||||
|
CheckSession.showLogoutDialog(params);
|
||||||
|
}else{
|
||||||
|
logger.log(Level.INFO, "show logut without parameters");
|
||||||
|
CheckSession.showLogoutDialog();
|
||||||
|
}
|
||||||
|
|
||||||
|
if(!CheckSession.getInstance().isShowSessionExpiredDialog() && this.rootPanel!=null){
|
||||||
rootPanel.clear();
|
rootPanel.clear();
|
||||||
rootPanel.add(showProblems());
|
rootPanel.add(showProblems());
|
||||||
getMainPanel().setHeight(350);
|
getMainPanel().setHeight(350);
|
||||||
}*/
|
}
|
||||||
|
|
||||||
CheckSession.showLogoutDialog();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue