diff --git a/core/src/main/java/hudson/model/AbstractItem.java b/core/src/main/java/hudson/model/AbstractItem.java index 9a1fe0cad19d261012838e0ebd44befb561577c8..ccfda51b10e4dc444e5b21d2041b2ef124094a02 100644 --- a/core/src/main/java/hudson/model/AbstractItem.java +++ b/core/src/main/java/hudson/model/AbstractItem.java @@ -344,6 +344,7 @@ public abstract class AbstractItem extends Actionable implements Item, HttpDelet * Nested ItemGroups are separated by / character. */ public String getRelativeNameFrom(ItemGroup p) { + if (p == null) return getFullName(); // first list up all the parents Map parents = new HashMap(); int depth=0; diff --git a/core/src/main/resources/hudson/model/Computer/index.jelly b/core/src/main/resources/hudson/model/Computer/index.jelly index 0549888a7d132cb72d91ecb53f5970a8155ef65b..071d2237d9be7d82b319540e5ab364464527e85a 100644 --- a/core/src/main/resources/hudson/model/Computer/index.jelly +++ b/core/src/main/resources/hudson/model/Computer/index.jelly @@ -111,7 +111,7 @@ THE SOFTWARE.

- + diff --git a/core/src/main/resources/hudson/model/Label/index.jelly b/core/src/main/resources/hudson/model/Label/index.jelly index 04d54a18bb8cd308b369aa41d9fc8f55c071ca58..57a68463129577928f48b01c7394d1627f0f4f73 100644 --- a/core/src/main/resources/hudson/model/Label/index.jelly +++ b/core/src/main/resources/hudson/model/Label/index.jelly @@ -53,7 +53,7 @@ THE SOFTWARE.

- + diff --git a/core/src/main/resources/hudson/model/View/main.groovy b/core/src/main/resources/hudson/model/View/main.groovy index 8f51aab6f96d25910aaff56267b1761bbd8c1d19..8de5e9232d0cf65eeaf1421ed8afb88c83c4f11d 100644 --- a/core/src/main/resources/hudson/model/View/main.groovy +++ b/core/src/main/resources/hudson/model/View/main.groovy @@ -11,7 +11,7 @@ if (items.isEmpty()) { } include(my,"noJob.jelly"); } else { - t.projectView(jobs: items, jobBaseUrl: "", showViewTabs: true, columnExtensions: my.columns, indenter: my.indenter) { + t.projectView(jobs: items, showViewTabs: true, columnExtensions: my.columns, indenter: my.indenter) { set("views",my.owner.views); set("currentView",my); if (my.owner.class == hudson.model.MyViewsProperty.class) { diff --git a/core/src/main/resources/hudson/views/JobColumn/column.jelly b/core/src/main/resources/hudson/views/JobColumn/column.jelly index 797cf0378799f4ad917c1b868e3daf5bc0440f53..4296af98636f85a1dbf0f930b3883f6f957797c6 100644 --- a/core/src/main/resources/hudson/views/JobColumn/column.jelly +++ b/core/src/main/resources/hudson/views/JobColumn/column.jelly @@ -25,6 +25,6 @@ THE SOFTWARE. - ${useFullName ? job.fullDisplayName : h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)} + ${h.getRelativeDisplayNameFrom(job,currentView.owner.itemGroup)} \ No newline at end of file diff --git a/core/src/main/resources/lib/hudson/projectView.jelly b/core/src/main/resources/lib/hudson/projectView.jelly index b3f6ff0ad0d244b19a440a0eedae49d08b16fa0f..3858bc0241422aa990f182bfa33e3c26c46e6842 100644 --- a/core/src/main/resources/lib/hudson/projectView.jelly +++ b/core/src/main/resources/lib/hudson/projectView.jelly @@ -33,10 +33,9 @@ THE SOFTWARE. May be interpreted by columns to display the full name of a job. - Will also append a parent URL to jobBaseUrl if needed. - The base URL of all job links. Normally ${rootURL}/ + Deprecated. Using this attribute has no effect. If the caller rendered a view tabes, set this attribute so that CSS is adjusted accordingly. @@ -79,7 +78,7 @@ THE SOFTWARE. - +