Remove 'Disable project' button from project view (#9287)

Revert "Revert "Remove 'Disable project' button from project view" (#9272)" This reverts commit 4623738.
jenkinsci · May 27, 2024 · 69b320f · 69b320f
1 parent 2c02654
commit 69b320f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 17 deletions.
diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
@@ -41,14 +41,5 @@ THE SOFTWARE.
  </form>
  </div>
  </j:when>
- <j:otherwise>
- <div align="right">
- <form method="post" id="disable-project" action="disable">
- <l:hasPermission permission="${it.CONFIGURE}">
- <f:submit value="${%Disable Project}" primary="false" />
- </l:hasPermission>
- </form>
- </div>
- </j:otherwise>
  </j:choose>
 </j:jelly>
diff --git a/test/src/test/java/hudson/model/ProjectTest.java b/test/src/test/java/hudson/model/ProjectTest.java
@@ -644,15 +644,13 @@ public void testDoDisable() throws Exception {
 
  JenkinsRule.WebClient wc = j.createWebClient();
  wc.withBasicCredentials(user.getId(), "password");
- HtmlPage p = wc.goTo(project.getUrl());
 
- List<HtmlForm> forms = p.getForms();
- for (HtmlForm form : forms) {
- if ("disable".equals(form.getAttribute("action"))) {
- j.submit(form);
- }
- }
- assertTrue("Project should be disabled.", project.isDisabled());
+ HtmlPage p = wc.getPage(project, "configure");
+ HtmlForm form = p.getFormByName("config");
+ form.getInputByName("enable").click();
+ j.submit(form);
+
+ assertTrue("Project should be disabled.", project.isDisabled());
  }
 
  @Test