From a6b3205b338a4e70a44ebe36b197a74b94e4618d Mon Sep 17 00:00:00 2001 From: mindless Date: Mon, 27 Jul 2009 16:48:35 +0000 Subject: [PATCH] [FIXED HUDSON-4070] Edit Description worked incorrectly when default view is changed from All jobs. git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20183 71c3de6d-444a-0410-be80-ed276b4c234a --- core/src/main/java/hudson/model/AllView.java | 9 +++++++++ core/src/main/java/hudson/model/Hudson.java | 7 +------ .../model/AbstractModelObject/descriptionForm.jelly | 5 ++++- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/core/src/main/java/hudson/model/AllView.java b/core/src/main/java/hudson/model/AllView.java index a65f87c41c..b4fea1925f 100644 --- a/core/src/main/java/hudson/model/AllView.java +++ b/core/src/main/java/hudson/model/AllView.java @@ -72,6 +72,15 @@ public class AllView extends View { return Hudson.getInstance().getItems(); } + @Override + public synchronized void doSubmitDescription( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { + checkPermission(Hudson.ADMINISTER); + + req.setCharacterEncoding("UTF-8"); + Hudson.getInstance().setSystemMessage(req.getParameter("description")); + rsp.sendRedirect("."); + } + @Override public String getPostConstructLandingPage() { return ""; // there's no configuration page diff --git a/core/src/main/java/hudson/model/Hudson.java b/core/src/main/java/hudson/model/Hudson.java index 1e545fea74..234964ded0 100644 --- a/core/src/main/java/hudson/model/Hudson.java +++ b/core/src/main/java/hudson/model/Hudson.java @@ -2348,12 +2348,7 @@ public final class Hudson extends Node implements ItemGroup, Stapl * Accepts the new description. */ public synchronized void doSubmitDescription( StaplerRequest req, StaplerResponse rsp ) throws IOException, ServletException { - checkPermission(ADMINISTER); - - req.setCharacterEncoding("UTF-8"); - systemMessage = req.getParameter("description"); - save(); - rsp.sendRedirect("."); + getPrimaryView().doSubmitDescription(req,rsp); } /** diff --git a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly index 1c5c6cdf5d..e913e327f8 100644 --- a/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly +++ b/core/src/main/resources/hudson/model/AbstractModelObject/descriptionForm.jelly @@ -26,6 +26,9 @@ THE SOFTWARE. Used by editableDescription.jelly for loading the edit form. --> + + +
@@ -34,4 +37,4 @@ THE SOFTWARE.
-
\ No newline at end of file +