[JENKINS-28011] Noting merge of #1663.

jenkinsci · Apr 23, 2015 · 8c94920 · 8c94920
2 parents fd42e33 + 343382b
commit 8c94920
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/changelog.html b/changelog.html
@@ -55,6 +55,9 @@
 <!-- Record your changes in the trunk here. -->
 <div id="trunk" style="display:none"><!--=TRUNK-BEGIN=-->
 <ul class=image>
+  <li class=bug>
+    <code>Descriptor.getId</code> fix in 1.610 introduced a regression affecting at least the Copy Artifacts plugin.
+    (<a href="https://issues.jenkins-ci.org/browse/JENKINS-28011">issue 28011</a>)
   <li class=bug>
     Search box did not work well inside folders.
     (<a href="https://issues.jenkins-ci.org/browse/JENKINS-24433">issue 24433</a>)

diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
@@ -47,7 +47,7 @@ THE SOFTWARE.
   <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.clazz.name}" />
   <f:invisibleEntry>
     <j:choose>
-      <j:when test="${descriptor != null and descriptor.id != clazz}">
+      <j:when test="${attrs.descriptor != null and attrs.descriptor.id != clazz}">
         <input type="hidden" name="kind" value="${attrs.descriptor.id}" />
       </j:when>
       <j:otherwise>