fixed "up" link

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@7482 71c3de6d-444a-0410-be80-ed276b4c234a

core/pom.xml

@@ -274,7 +274,7 @@
     <dependency>
       <groupId>org.kohsuke.stapler</groupId>
       <artifactId>stapler</artifactId>
-      <version>1.62</version>
+      <version>1.63</version>
     </dependency>
     <dependency>
       <groupId>org.kohsuke</groupId>

core/src/main/java/hudson/matrix/MatrixRun.java

@@ -31,6 +31,20 @@ public class MatrixRun extends Build<MatrixConfiguration,MatrixRun> {
         super(project, buildDir);
     }
 
+    public String getUpUrl() {
+        StaplerRequest req = Stapler.getCurrentRequest();
+        if(req!=null) {
+            List<Ancestor> ancs = req.getAncestors();
+            for( int i=1; i<ancs.size(); i++) {
+                if(ancs.get(i).getObject()==this) {
+                    if(ancs.get(i-1).getObject() instanceof MatrixBuild) {
+                        return ancs.get(i-1).getUrl()+'/';
+                    }
+                }
+            }
+        }
+        return super.getDisplayName();
+    }
 
     public String getDisplayName() {
         StaplerRequest req = Stapler.getCurrentRequest();

core/src/main/java/hudson/maven/MavenBuild.java

@@ -71,6 +71,23 @@ public class MavenBuild extends AbstractBuild<MavenModule,MavenBuild> {
         super(project, buildDir);
     }
 
+    @Override
+    public String getUpUrl() {
+        StaplerRequest req = Stapler.getCurrentRequest();
+        if(req!=null) {
+            List<Ancestor> ancs = req.getAncestors();
+            for( int i=1; i<ancs.size(); i++) {
+                if(ancs.get(i).getObject()==this) {
+                    if(ancs.get(i-1).getObject() instanceof MavenModuleSetBuild) {
+                        // if under MavenModuleSetBuild, "up" means MMSB
+                        return ancs.get(i-1).getUrl()+'/';
+                    }
+                }
+            }
+        }
+        return super.getUpUrl();
+    }
+
     @Override
     public String getDisplayName() {
         StaplerRequest req = Stapler.getCurrentRequest();

core/src/main/java/hudson/model/AbstractBuild.java

@@ -3,7 +3,9 @@ package hudson.model;
 import hudson.Launcher;
 import hudson.Proc.LocalProc;
 import hudson.Util;
+import hudson.Functions;
 import hudson.matrix.MatrixConfiguration;
+import hudson.matrix.MatrixRun;
 import hudson.maven.MavenBuild;
 import hudson.model.Fingerprint.BuildPtr;
 import hudson.model.Fingerprint.RangeSet;
@@ -23,6 +25,7 @@ import hudson.util.AdaptedIterator;
 import hudson.util.Iterators;
 import org.kohsuke.stapler.StaplerRequest;
 import org.kohsuke.stapler.StaplerResponse;
+import org.kohsuke.stapler.Stapler;
 import org.kohsuke.stapler.export.Exported;
 import org.xml.sax.SAXException;
 
@@ -42,6 +45,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import sun.misc.Request;
+
 /**
  * Base implementation of {@link Run}s that build software.
  *
@@ -123,6 +128,22 @@ public abstract class AbstractBuild<P extends AbstractProject<P,R>,R extends Abs
         return builtOn;
     }
 
+    /**
+     * Used to render the side panel "Back to project" link.
+     *
+     * <p>
+     * In a rare situation where a build can be reached from multiple paths,
+     * returning different URLs from this method based on situations might
+     * be desirable.
+     *
+     * <p>
+     * If you override this method, you'll most likely also want to override
+     * {@link #getDisplayName()}.
+     */
+    public String getUpUrl() {
+        return Functions.getNearestAncestorUrl(Stapler.getCurrentRequest(),getParent())+'/';
+    }
+
     /**
      * List of users who committed a change since the last non-broken build till now.
      *

core/src/main/resources/hudson/model/AbstractBuild/sidepanel.jelly

@@ -6,7 +6,7 @@
   <l:side-panel>
     <l:tasks>
       <j:set var="buildUrl" value="${h.decompose(request)}" />
-      <l:task icon="images/24x24/up.gif" href="${h.getNearestAncestorUrl(request,it.parent)}/" title="${%Back to Project}" />
+      <l:task icon="images/24x24/up.gif" href="${it.upUrl}" title="${%Back to Project}" />
       <l:task icon="images/24x24/search.gif" href="${buildUrl.baseUrl}/" title="${%Status}" />
       <l:task icon="images/24x24/notepad.gif" href="${buildUrl.baseUrl}/changes" title="${%Changes}" />
       <j:choose>