From e2a5ec81f949b6929191876c356a06aeff2984b0 Mon Sep 17 00:00:00 2001 From: kohsuke Date: Sun, 24 Jun 2007 05:31:23 +0000 Subject: [PATCH] disabled configuration/deletion/build of MatrixConfiguration. This is ugly way of implementing this... git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@3539 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/matrix/MatrixConfiguration.java | 14 ++++++++++++++ .../main/java/hudson/model/AbstractProject.java | 8 ++++++++ .../hudson/model/AbstractProject/sidepanel.jelly | 10 ++++++---- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/matrix/MatrixConfiguration.java b/core/src/main/java/hudson/matrix/MatrixConfiguration.java index fb203b91d8..482e5d65d6 100644 --- a/core/src/main/java/hudson/matrix/MatrixConfiguration.java +++ b/core/src/main/java/hudson/matrix/MatrixConfiguration.java @@ -40,6 +40,15 @@ public class MatrixConfiguration extends Project combination = Combination.fromString(name); } + /** + * Build numbers are always synchronized with the parent. + */ + @Override + public int getNextBuildNumber() { + MatrixBuild lb = getParent().getLastBuild(); + return lb!=null ? lb.getNumber() : 0; + } + public MatrixProject getParent() { return (MatrixProject)super.getParent(); } @@ -58,6 +67,11 @@ public class MatrixConfiguration extends Project return node.getWorkspaceFor(getParent()).child(getName()); } + @Override + public boolean isConfigurable() { + return false; + } + @Override protected Class getBuildClass() { return MatrixRun.class; diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index 518d237482..bcd2c18efb 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -195,6 +195,14 @@ public abstract class AbstractProject

,R extends A return !isDisabled(); } + /** + * Used in sidepanel.jelly to decide whether to display + * the config/delete/build links. + */ + public boolean isConfigurable() { + return true; + } + public boolean isDisabled() { return disabled; } diff --git a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly index c7edd7dca3..6a782dbe7d 100644 --- a/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly +++ b/core/src/main/resources/hudson/model/AbstractProject/sidepanel.jelly @@ -15,11 +15,13 @@ - - + + + + + + - - -- GitLab