[JENKINS-5047] Fixed JavaScript update during Ajax refresh.

jenkinsci · May 9, 2011 · 393e397 · 393e397
1 parent ed9b91e
commit 393e397
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row.jelly b/core/src/main/resources/hudson/model/UpdateCenter/RestartJenkinsJob/row.jelly
@@ -24,7 +24,7 @@ THE SOFTWARE.
 
 <?jelly escape-by-default='true'?>
 <j:jelly xmlns:j="jelly:core" xmlns:st="jelly:stapler" xmlns:d="jelly:define" xmlns:l="/lib/layout" xmlns:t="/lib/hudson" xmlns:f="/lib/form">
-  <tr id="row${it.id}">
+  <tr id="restart">
     <td style="vertical-align: top; padding-right:1em">${%Restarting Jenkins}</td>
     <td id="status"><img src="${imagesURL}/24x24/refresh.png" alt="" />
     ${%Pending}

diff --git a/core/src/main/resources/hudson/model/UpdateCenter/index.jelly b/core/src/main/resources/hudson/model/UpdateCenter/index.jelly
@@ -59,11 +59,13 @@ THE SOFTWARE.
                         if(target==null) {
                           document.getElementById("log").appendChild(row);
                         } else {
-                          var tcell = target.cells[1];
-                          var scell = row.cells[1];
-                          if(scell.id!=tcell.id) {
-                            tcell.innerHTML = scell.innerHTML;
-                            tcell.id = scell.id;
+                          if (row.id != 'restart') {
+                            var tcell = target.cells[1];
+                            var scell = row.cells[1];
+                            if(scell.id!=tcell.id) {
+                              tcell.innerHTML = scell.innerHTML;
+                              tcell.id = scell.id;
+                            }
                           }
                         }
                       }