From f00979aea4d46ddeb58718f1d91c8bb0c64444d1 Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 1 Jun 2009 02:48:58 +0000 Subject: [PATCH] [FIXED HUDSON-1879] don't allow renaming a job while a build is running. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@18628 71c3de6d-444a-0410-be80-ed276b4c234a --- .../java/hudson/model/AbstractProject.java | 8 ----- core/src/main/java/hudson/model/Job.java | 14 +++++++++ .../resources/hudson/model/Job/rename.jelly | 30 ++++++++++++------- .../hudson/model/Job/rename.properties | 4 ++- 4 files changed, 37 insertions(+), 19 deletions(-) diff --git a/core/src/main/java/hudson/model/AbstractProject.java b/core/src/main/java/hudson/model/AbstractProject.java index c7a9819330..155aa6f7e8 100644 --- a/core/src/main/java/hudson/model/AbstractProject.java +++ b/core/src/main/java/hudson/model/AbstractProject.java @@ -605,14 +605,6 @@ public abstract class AbstractProject

,R extends A return Hudson.getInstance().getQueue().getItem(this); } - /** - * Returns true if a build of this project is in progress. - */ - public boolean isBuilding() { - R b = getLastBuild(); - return b!=null && b.isBuilding(); - } - /** * Gets the JDK that this project is configured with, or null. */ diff --git a/core/src/main/java/hudson/model/Job.java b/core/src/main/java/hudson/model/Job.java index 4473db38c1..b013e8433d 100644 --- a/core/src/main/java/hudson/model/Job.java +++ b/core/src/main/java/hudson/model/Job.java @@ -210,6 +210,14 @@ public abstract class Job, RunT extends Run, RunT extends Run - - - -

- ${%description(it.name, newName)} - - - - + + + + + ${%noRenameWhileBuilding} + +
${%configWasSaved} +
+
+ + +
+ ${%description(it.name, newName)} + + + + +
+
- \ No newline at end of file + diff --git a/core/src/main/resources/hudson/model/Job/rename.properties b/core/src/main/resources/hudson/model/Job/rename.properties index 024cf25cd4..ee8b3c67aa 100644 --- a/core/src/main/resources/hudson/model/Job/rename.properties +++ b/core/src/main/resources/hudson/model/Job/rename.properties @@ -20,6 +20,8 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +noRenameWhileBuilding=Unable to rename a job while it is building. +configWasSaved=All other configuration options were saved. description=Are you sure about renaming {0} to {1}? Yes=Yes -No=No \ No newline at end of file +No=No