Scarab commit: svn commit: r10873 - trunk/src: java/org/tigris/scarab/pipeline webapp/WEB-INF/templates/navigations

Author: dabbous
Date: 2010-01-22 01:28:38-0800
New Revision: 10873

Modified:
   trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
   trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm

Log:
SCB3015:
CommonLinks.vm has overwritten the current data container by unconditionally changing the parameter queryId to the current default QueryId.

DetermineTargetValve.java sets the currentQueryId if needed. Here i have disregarded what happens when a query shall be EDITED instead of just called. The code now takes editing into account. In fact it now only modifies the event-parameter (to actually call a query), if queryId is available, but no event has been coded. In that case we have called a query using a short link.


Modified: trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java?view=diff&pathrev=10873&r1=10872&r2=10873
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	(original)
+++ trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	2010-01-22 01:28:38-0800
@@ -47,6 +47,7 @@
  */ 
 
 import java.io.IOException;
+import java.util.Enumeration;
 
 import org.apache.fulcrum.parser.ParameterParser;
 import org.apache.torque.TorqueException;
@@ -81,16 +82,20 @@
         {
             String target = parameters.getString("template");
             String query  = parameters.getString("query");
+            if(query==null)
+            {
+                query = parameters.getString("queryId");
+            }
 
-            if (query != null)
+            if (query != null && getEventKey(parameters)==null)
             {
+                parameters.setString("eventSubmit_doSelectquery", "foo");
                 // Allows short link to public/personal queries
                 // $scarabRoot/issues/query/<queryId>/curmodule/<moduleId>                
                 if (target == null) target="IssueList.vm";
                 data.setTarget(target);
                 if (parameters.getString("tqk")      == null) parameters.setString("tqk", ""+0);
                 if (parameters.getString("action")   == null) data.setAction("Search");
-                if (parameters.getString("eventSubmit_doSelectquery") == null) parameters.setString("eventSubmit_doSelectquery", "foo");
                 if (parameters.getString("go")       == null) parameters.setString("go",query);
             }
             else if (target != null)
@@ -150,4 +155,18 @@
         // Pass control to the next Valve in the Pipeline
         context.invokeNext(data);
     }
+
+    private Object getEventKey(ParameterParser parameters) 
+    {
+        Enumeration en = parameters.keys();
+        while(en.hasMoreElements())
+        {
+            Object key = en.nextElement();
+            if(key.toString().startsWith("event"))
+            {
+                return key;
+            }
+        }
+        return null;
+    }
 }

Modified: trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm?view=diff&pathrev=10873&r1=10872&r2=10873
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/navigations/CommonLinks.vm	2010-01-22 01:28:38-0800
@@ -53,10 +53,12 @@
   <div class="body">
     #set ($queryId = $data.User.getDefaultQueryId($module))
     #set ($homePage= $data.User.getHomePage($module))
+    #set ($newQueryId = $data.Parameters.getString("queryId") )
     #set ($dummy   = $data.Parameters.setString("query",$queryId) )
     #set ($dummy   = $data.Parameters.setString("queryId",$queryId) )
     <strong><a href="$link.setPage($homePage).addPathInfo("query","$queryId")">$l10n.IssueTrackingHome</a></strong> | 
     <strong><a href="$link.setPage("SelectModule.vm")">$l10n.Modules ...</a></strong>
+    #if ($newQueryId) $dummy   = $data.Parameters.setString("queryId", $newQueryId) #end
   </div>
 </div>

------------------------------------------------------
http://scarab.tigris.org/ds/viewMessage.do?dsForumId=3577&dsMessageId=2441126