SAK-42189 Filepicker : Solve navigation issues on tabs (sakaiproject#…

…7172)
chundcm · Jul 29, 2019 · cf3769a · cf3769a
1 parent 08db4a0
commit cf3769a
Showing 1 changed file with 18 additions and 8 deletions.
diff --git a/content/content-tool/tool/src/java/org/sakaiproject/content/tool/FilePickerAction.java b/content/content-tool/tool/src/java/org/sakaiproject/content/tool/FilePickerAction.java
@@ -2407,10 +2407,11 @@ else if(action instanceof ServiceLevelAction)
 	public void doExpand_collection(RunData data) throws IdUnusedException, TypeException, PermissionException
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
-		toolSession.setAttribute(STATE_NAVIGATING_RESOURCES, true);
-
 		Set<String> expandedItems = getExpandedCollections(toolSession);
 
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();
 
@@ -2426,10 +2427,11 @@ public void doExpand_collection(RunData data) throws IdUnusedException, TypeExce
 	public void doCollapse_collection(RunData data)
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
-		toolSession.setAttribute(STATE_NAVIGATING_RESOURCES, true);
-
 		Set<String> expandedItems = getExpandedCollections(toolSession);
 
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();
 		String collectionId = params.getString("collectionId");
@@ -2454,7 +2456,9 @@ public void doCollapse_collection(RunData data)
 	public void doExpandall ( RunData data)
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
-		toolSession.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
 
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();
@@ -2482,6 +2486,9 @@ public void doUnexpandall ( RunData data)
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
 
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();
 
@@ -2506,7 +2513,9 @@ public void doUnexpandall ( RunData data)
 	public void doShowOtherSites(RunData data)
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
-		toolSession.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
 
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();
@@ -2530,9 +2539,10 @@ public void doShowOtherSites(RunData data)
 	public void doHideOtherSites(RunData data)
 	{
 		ToolSession toolSession = sessionManager.getCurrentToolSession();
-
 		toolSession.setAttribute(STATE_SHOW_OTHER_SITES, Boolean.FALSE.toString());
-		toolSession.setAttribute(STATE_NAVIGATING_RESOURCES, true);
+
+		SessionState state = ((JetspeedRunData)data).getPortletSessionState (((JetspeedRunData)data).getJs_peid ());
+		state.setAttribute(STATE_NAVIGATING_RESOURCES, true);
 
 		//get the ParameterParser from RunData
 		ParameterParser params = data.getParameters ();