[JENKINS-26781] set $class in submitted form to use descriptor.id, so…

… descriptor can be retrieved by ID, which _may_ not be clazz.name
jenkinsci · Feb 4, 2015 · 3edce884ec57c2b98d1aa18cd4a2c744bf1719c9 · 3edce88
1 parent a944634
commit 3edce884ec57c2b98d1aa18cd4a2c744bf1719c9
Unified Split

Showing with 2 additions and 1 deletion.

+1 −0 core/src/main/java/hudson/model/Descriptor.java

+1 −1 core/src/main/resources/lib/form/class-entry.jelly
diff --git a/core/src/main/java/hudson/model/Descriptor.java b/core/src/main/java/hudson/model/Descriptor.java
@@ -918,6 +918,7 @@ private URL getStaticHelpUrl(Klass<?> c, String suffix) {
                 if (d != null) {
                     items.add(d.newInstance(req, jo));
                 }
+                LOGGER.warning("Received unexpected formData for descriptor " + kind);
             }
         }
 

diff --git a/core/src/main/resources/lib/form/class-entry.jelly b/core/src/main/resources/lib/form/class-entry.jelly
@@ -34,7 +34,7 @@ THE SOFTWARE.
       structured form submission.  Mutually exclusive with clazz.
     </st:attribute>
   </st:documentation>
-  <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.clazz.name}" />
+  <j:set var="clazz" value="${attrs.clazz ?: attrs.descriptor.id}" />
   <f:invisibleEntry>
     <!-- Legacy: Remove once plugins have been staged onto $class -->
     <input type="hidden" name="stapler-class" value="${clazz}" />