Revert "Remove 'Disable project' button from project view" (jenkinsci…

…#9272) This reverts commit 57d6464.
janfaracik · May 14, 2024 · 4623738 · 4623738
1 parent a751e55
commit 4623738
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 6 deletions.
diff --git a/core/src/main/resources/lib/hudson/project/makeDisabled.jelly b/core/src/main/resources/lib/hudson/project/makeDisabled.jelly
@@ -41,5 +41,14 @@ 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,13 +644,15 @@ public void testDoDisable() throws Exception {
 
         JenkinsRule.WebClient wc = j.createWebClient();
         wc.withBasicCredentials(user.getId(), "password");
+        HtmlPage p = wc.goTo(project.getUrl());
 
-        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());
+        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());
     }
 
     @Test