Scarab commit: svn commit: r10605 - trunk/src: java/org/tigris/scarab/actions webapp/WEB-INF/templates/screens webapp/WEB-INF/templates/viewIssue

Author: hair
Date: 2008-08-12 14:36:39-0700
New Revision: 10605

Modified:
   trunk/src/java/org/tigris/scarab/actions/ViewIssue.java
   trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
   trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm

Log:
Issue SCB1587:  (Wrong tab opened when browsing issues) 
 patch from Johannes Hoechstaedter. lots of thanks.


Modified: trunk/src/java/org/tigris/scarab/actions/ViewIssue.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/actions/ViewIssue.java?view=diff&rev=10605&p1=trunk/src/java/org/tigris/scarab/actions/ViewIssue.java&p2=trunk/src/java/org/tigris/scarab/actions/ViewIssue.java&r1=10604&r2=10605
==============================================================================
--- trunk/src/java/org/tigris/scarab/actions/ViewIssue.java	(original)
+++ trunk/src/java/org/tigris/scarab/actions/ViewIssue.java	2008-08-12 14:36:39-0700
@@ -73,10 +73,50 @@
             .getBoolean(ScarabConstants.SINGLE_SCREEN_ONLY, false);
         // the velocity template hides the link to actually get here,
         //  but just to be extra secure.
-        final String tab = singleScreenOnly 
-            ? ScarabConstants.ISSUE_VIEW_ALL
-            : data.getParameters().getString("tab", ScarabConstants.ISSUE_VIEW_ALL);
-            
-        data.getUser().setTemp(ScarabConstants.TAB_KEY, tab); 
+        
+        String tabmode = data.getParameters().getString("tabmode");
+        
+        if(tabmode == null){
+       	 
+       	 	tabmode = (String)data.getUser().getTemp("tabmode");
+       	 	
+       	 	if(tabmode == null){
+         	
+       	 		if(singleScreenOnly){
+             	
+       	 			tabmode = "all";
+             	
+       	 		}
+       	 		else{
+             	
+             		tabmode = "tabs";
+             	
+       	 		}
+         	
+       	 	}
+       	 
+        }
+         
+         String tab = null;
+         
+         if(tabmode.equals("all")){
+        	 
+        	 tab = ScarabConstants.ISSUE_VIEW_ALL;
+        	 
+         }
+         else{
+        	 
+        	 tab = data.getParameters().getString("tab");
+        	 
+         }
+         
+         if(tab == null){
+        	 
+        	 tab = "1";
+        	 
+         }
+         
+         data.getUser().setTemp(ScarabConstants.TAB_KEY, tab); 
+         data.getUser().setTemp("tabmode", tabmode); 
     }
 }

Modified: trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm?view=diff&rev=10605&p1=trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm&p2=trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm&r1=10604&r2=10605
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/ViewIssue.vm	2008-08-12 14:36:39-0700
@@ -60,14 +60,14 @@
       #if ($tab.equals("all"))
         #initializeTabLink()
         #if (!$singleScreenOnly)
-          <div align="right"><small><a href="$tabLink.addPathInfo("tab", "1")">$l10n.ViewAsTabs</a></small></div>
+          <div align="right"><small><a href="$tabLink.addPathInfo("tabmode", "tabs")">$l10n.ViewAsTabs</a></small></div>
         #end
 
         #navigate()
 
       #elseif (!$multiple.equals("true"))
         #initializeTabLink()
-        <div align="right"><small><a href="$tabLink.addPathInfo("tab", "all")">$l10n.ViewAsSingleScreen</a></small></div>
+        <div align="right"><small><a href="$tabLink.addPathInfo("tabmode", "all")">$l10n.ViewAsSingleScreen</a></small></div>
 
         #navigate()
 

Modified: trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm?view=diff&rev=10605&p1=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm&p2=trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm&r1=10604&r2=10605
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/viewIssue/ViewIssueTab4Dep.vm	2008-08-12 14:36:39-0700
@@ -152,7 +152,7 @@
           <td nowrap="nowrap" #addBackground("$blockingStatus" "$status")>
             #if ($scarabR.hasPermission($scarabG.Permission.ISSUE__VIEW, $depend.Module))
               #doIndent ($indentLevel)
-              $link.setPage("ViewIssue.vm").addPathInfo("id", $depend.UniqueId).setLabel("$depend.UniqueId")
+                $link.setPage("ViewIssue.vm").addPathInfo("id", $depend.UniqueId).addPathInfo("eventsubmit_dosetissueview", "foo").addPathInfo("action", "ViewIssue").addPathInfo("tab", "1").setLabel("$depend.UniqueId")
             #else
               $l10n.PrivateIssue
             #end