From 277fa849ffe1c61bfbbf5f79bd49928fa95c6a30 Mon Sep 17 00:00:00 2001
From: kohsuke <kohsuke@71c3de6d-444a-0410-be80-ed276b4c234a>
Date: Mon, 22 Jan 2007 06:07:33 +0000
Subject: [PATCH] added the shortUrl() method.

git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@1874 71c3de6d-444a-0410-be80-ed276b4c234a
---
 core/src/main/java/hudson/model/AbstractItem.java    | 6 +++++-
 core/src/main/java/hudson/model/Item.java            | 8 +++++++-
 core/src/main/resources/lib/hudson/projectView.jelly | 8 ++++----
 3 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java
index 774a2772dc..c7465de865 100644
--- a/core/src/main/java/hudson/model/AbstractItem.java
+++ b/core/src/main/java/hudson/model/AbstractItem.java
@@ -107,7 +107,11 @@ public abstract class AbstractItem extends Actionable implements Item {
     }
 
     public final String getUrl() {
-        return getParent().getUrl()+getParent().getUrlChildPrefix()+'/'+getName()+'/';
+        return getParent().getUrl()+getShortUrl();
+    }
+
+    public String getShortUrl() {
+        return getParent().getUrlChildPrefix()+'/'+getName()+'/';
     }
 
     /**
diff --git a/core/src/main/java/hudson/model/Item.java b/core/src/main/java/hudson/model/Item.java
index c2a9c2b189..ba9faa1210 100644
--- a/core/src/main/java/hudson/model/Item.java
+++ b/core/src/main/java/hudson/model/Item.java
@@ -69,12 +69,18 @@ public interface Item extends PersistenceRoot {
     String getFullName();
 
     /**
-     * Returns the URL of this project relative to the context root of the application.
+     * Returns the URL of this item relative to the context root of the application.
      *
      * @see AbstractItem#getUrl() for how to implement this.
      */
     String getUrl();
 
+    /**
+     * Returns the URL of this item relative to the parent {@link ItemGroup}.
+     * @see AbstractItem#getShortUrl() for how to implement this.
+     */
+    String getShortUrl();
+
     /**
      * Called right after when a {@link Item} is loaded from disk.
      * This is an opporunity to do a post load processing.
diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly
index cce516f11a..7d808d104d 100644
--- a/core/src/main/resources/lib/hudson/projectView.jelly
+++ b/core/src/main/resources/lib/hudson/projectView.jelly
@@ -47,7 +47,7 @@
               <img src="${rootURL}/images/${iconSize}/${job.buildStatusUrl}" />
             </td>
             <td>
-              <a href="${jobBaseUrl}${job.url}">
+              <a href="${jobBaseUrl}${job.shortUrl}">
                   ${job.displayName}
               </a>
             </td>
@@ -55,7 +55,7 @@
               <j:choose>
                 <j:when test="${lsBuild!=null}">
                   ${lsBuild.timestampString}
-                  (<a href="${jobBaseUrl}${job.url}lastSuccessfulBuild/">#${lsBuild.number}</a>)
+                  (<a href="${jobBaseUrl}${job.shortUrl}lastSuccessfulBuild/">#${lsBuild.number}</a>)
                 </j:when>
                 <j:otherwise>
                   N/A
@@ -66,7 +66,7 @@
               <j:choose>
                 <j:when test="${lfBuild!=null}">
                   ${lfBuild.timestampString}
-                  (<a href="${jobBaseUrl}${job.url}lastFailedBuild/">#${lfBuild.number}</a>)
+                  (<a href="${jobBaseUrl}${job.shortUrl}lastFailedBuild/">#${lfBuild.number}</a>)
                 </j:when>
                 <j:otherwise>
                   N/A
@@ -92,7 +92,7 @@
             <l:isAdmin>
               <td>
                 <j:if test="${job.buildable}">
-                  <a href="${jobBaseUrl}${job.url}build">
+                  <a href="${jobBaseUrl}${job.shortUrl}build">
                     <img src="${rootURL}/images/${subIconSize}/clock.gif" title="Schedule a build" border="0" /></a>
                 </j:if>
               </td>