From 0da5be71c2160edf80f83efee487e8b070f7d88d Mon Sep 17 00:00:00 2001
From: appr <appr@appr.me>
Date: Sun, 26 Jun 2011 23:08:16 +0400
Subject: [PATCH] [FIXED JENKINS-10044] Restart button does not restart jenkins
 after plugin upload

Restart button that appears under list of installed plugins after plugin
upload does not restart jenkins when clicked.

More than that, after turning on/off some of installed plugins,
two restart buttons appear (only one of them work) on the page in
question.

Such behaviour should definitely be fixed.
---
 changelog.html                                      |  3 +++
 .../resources/hudson/PluginManager/installed.jelly  | 13 +++----------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/changelog.html b/changelog.html
index 904cd8c376..2d154a9620 100644
--- a/changelog.html
+++ b/changelog.html
@@ -55,6 +55,9 @@ Upcoming changes</a>
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    Restart button does not restart jenkins after plugin upload
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-10044">issue 10044</a>)
   <li class=rfe>
     Groovy script console is now syntax highlighted.
   <li class=rfe>
diff --git a/core/src/main/resources/hudson/PluginManager/installed.jelly b/core/src/main/resources/hudson/PluginManager/installed.jelly
index 303331745c..9e0f0387ba 100644
--- a/core/src/main/resources/hudson/PluginManager/installed.jelly
+++ b/core/src/main/resources/hudson/PluginManager/installed.jelly
@@ -104,16 +104,6 @@ THE SOFTWARE.
         </j:choose>
       </table>
 
-      <j:if test="${it.isPluginUploaded()}">
-        <div style="margin: 1em; height: 1em">
-          <div class="error">
-            ${%New plugins will take effect once you restart Jenkins}
-            <j:if test="${app.lifecycle.canRestart()}">
-              <s:submit value="${%Restart Once No Jobs Are Running}" />
-            </j:if>
-          </div>
-        </div>
-      </j:if>
       <div class="warning" id="needRestart" style="display:none; margin: 1em; height: 1em">
         <form method="post" action="${rootURL}/safeRestart">
           ${%Changes will take effect when you restart Jenkins}
@@ -145,6 +135,9 @@ THE SOFTWARE.
             return String(e.checked)!=e.getAttribute('original');
           });
 
+          <j:if test="${it.isPluginUploaded()}">
+            e = true;
+          </j:if>
           $('needRestart').style.display = (e!=null?"block":"none");
         }
 
-- 
GitLab