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

Author: dabbous
Date: 2009-06-09 17:11:19-0700
New Revision: 10758

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

Log:
SCB2974: Added shortlinks to the query editor. So now shortlinks for queries are established within Scarab. I had to fix what happens when a template is given together with a query...

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=10758&r1=10757&r2=10758
==============================================================================
--- trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	(original)
+++ trunk/src/java/org/tigris/scarab/pipeline/DetermineTargetValve.java	2009-06-09 17:11:19-0700
@@ -80,8 +80,20 @@
         if (! data.hasTarget())
         {
             String target = parameters.getString("template");
+            String query  = parameters.getString("query");
 
-            if (target != null)
+            if (query != null)
+            {
+                // 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)
             {
                 data.setTarget(target);
                 Log.get().debug("Set target from request parameter");
@@ -92,16 +104,6 @@
                 // $scarabRoot/issues/id/<issueId>
                 data.setTarget("ViewIssue.vm");
             }
-            else if (parameters.getString("query") != null)
-            {
-                // Allows short link to public/personal queries
-                // $scarabRoot/issues/query/<queryId>/curmodule/<moduleId>                
-                if (parameters.getString("tqk")      == null) parameters.setString("tqk", ""+0);
-                if (parameters.getString("template") == null) data.setTarget("IssueList.vm");
-                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",parameters.getString("query"));
-            }
             else
             {
                 //data.getResponse().sendError(404);

Modified: trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm
Url: http://scarab.tigris.org/source/browse/scarab/trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm?view=diff&pathrev=10758&r1=10757&r2=10758
==============================================================================
--- trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm	(original)
+++ trunk/src/webapp/WEB-INF/templates/screens/QueryList.vm	2009-06-09 17:11:19-0700
@@ -108,9 +108,9 @@
 
   <td>
   #if (!$query.Approved)
-   <a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$l10n.Personal ($l10n.UntilApproved)</a>
+   <a href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$l10n.Personal ($l10n.UntilApproved)</a>
   #else
-  <a href="$scarabR.getExecuteLink($link.setPage("IssueList.vm").toString(), $query)">$query.Scope.Name</a>
+  <a href="$link.setPathInfo("query", "$query.QueryId" ).setPage("IssueList.vm")">$query.Scope.Name</a>
   #end
   </td>

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