From 01daea2fbffcb8e67d1f322ef1305f2b67573d0f Mon Sep 17 00:00:00 2001 From: huybrechts Date: Wed, 5 Aug 2009 05:59:04 +0000 Subject: [PATCH] [FIXED HUDSON-4160] fixed redirect after deleting view git-svn-id: https://hudson.dev.java.net/svn/hudson/trunk/hudson/main@20452 71c3de6d-444a-0410-be80-ed276b4c234a --- .../src/main/java/hudson/model/ProxyView.java | 3 +++ core/src/main/java/hudson/model/View.java | 4 ++-- .../resources/hudson/model/View/delete.jelly | 2 +- .../org/jvnet/hudson/test/HudsonTestCase.java | 9 ++++++++ test/src/test/java/hudson/model/ViewTest.java | 22 ++++++++++++++++++- 5 files changed, 36 insertions(+), 4 deletions(-) diff --git a/core/src/main/java/hudson/model/ProxyView.java b/core/src/main/java/hudson/model/ProxyView.java index 85421b8796..31a3635208 100644 --- a/core/src/main/java/hudson/model/ProxyView.java +++ b/core/src/main/java/hudson/model/ProxyView.java @@ -38,6 +38,9 @@ import org.kohsuke.stapler.StaplerResponse; /** * A view that delegates to another. + * + * TODO: this does not respond to renaming or deleting the proxied view. + * * @author Tom Huybrechts * */ diff --git a/core/src/main/java/hudson/model/View.java b/core/src/main/java/hudson/model/View.java index 49b630fc39..af1ec2d4c9 100644 --- a/core/src/main/java/hudson/model/View.java +++ b/core/src/main/java/hudson/model/View.java @@ -504,13 +504,13 @@ public abstract class View extends AbstractModelObject implements AccessControll /** * Deletes this view. */ - public synchronized HttpResponse doDoDelete() throws IOException, ServletException { + public synchronized void doDoDelete(StaplerRequest req, StaplerResponse rsp) throws IOException, ServletException { requirePOST(); checkPermission(DELETE); owner.deleteView(this); - return new HttpRedirect("/" + owner.getUrl()); + rsp.sendRedirect2(req.getContextPath()+"/" + owner.getUrl()); } diff --git a/core/src/main/resources/hudson/model/View/delete.jelly b/core/src/main/resources/hudson/model/View/delete.jelly index 0a1878a6eb..03f8a1ae52 100644 --- a/core/src/main/resources/hudson/model/View/delete.jelly +++ b/core/src/main/resources/hudson/model/View/delete.jelly @@ -27,7 +27,7 @@ THE SOFTWARE. -
+ ${%Are you sure about deleting the view?} diff --git a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java index 8e8a6ff873..0139acce95 100644 --- a/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java +++ b/test/src/main/java/org/jvnet/hudson/test/HudsonTestCase.java @@ -52,6 +52,7 @@ import hudson.model.Saveable; import hudson.model.TaskListener; import hudson.model.UpdateCenter; import hudson.model.AbstractProject; +import hudson.model.View; import hudson.model.UpdateCenter.UpdateCenterConfiguration; import hudson.model.Node.Mode; import hudson.security.csrf.CrumbIssuer; @@ -883,6 +884,14 @@ public abstract class HudsonTestCase extends TestCase { return goTo(item.toComputer().getUrl()+relative); } + public HtmlPage getPage(View view) throws IOException, SAXException { + return goTo(view.getUrl()); + } + + public HtmlPage getPage(View view, String relative) throws IOException, SAXException { + return goTo(view.getUrl()+relative); + } + /** * @deprecated * This method expects a full URL. This method is marked as deprecated to warn you diff --git a/test/src/test/java/hudson/model/ViewTest.java b/test/src/test/java/hudson/model/ViewTest.java index 3d9535e6f2..11b1642d2b 100644 --- a/test/src/test/java/hudson/model/ViewTest.java +++ b/test/src/test/java/hudson/model/ViewTest.java @@ -38,7 +38,8 @@ import static hudson.model.Messages.Hudson_ViewName; * @author Kohsuke Kawaguchi */ public class ViewTest extends HudsonTestCase { - /** + + /** * Creating two views with the same name. */ @Email("http://d.hatena.ne.jp/ssogabe/20090101/1230744150") @@ -92,4 +93,23 @@ public class ViewTest extends HudsonTestCase { assertEquals(((ProxyView) proxyView).getProxiedViewName(), "listView"); assertEquals(((ProxyView) proxyView).getProxiedView(), listView); } + + public void testDeleteView() throws Exception { + WebClient wc = new WebClient(); + + ListView v = new ListView("list", hudson); + hudson.addView(v); + HtmlPage delete = wc.getPage(v, "delete"); + submit(delete.getFormByName("delete")); + assertNull(hudson.getView("list")); + + User user = User.get("user", true); + MyViewsProperty p = user.getProperty(MyViewsProperty.class); + v = new ListView("list", p); + p.addView(v); + delete = wc.getPage(v, "delete"); + submit(delete.getFormByName("delete")); + assertNull(p.getView("list")); + + } }