From a66959d76db62f06c65ee0e5d66a398a5ca5787f Mon Sep 17 00:00:00 2001
From: Kohsuke Kawaguchi <kk@kohsuke.org>
Date: Thu, 31 Mar 2011 16:15:25 -0700
Subject: [PATCH] degrade to rowSet, which works nicely with descriptorList

---
 .../resources/lib/form/optionalBlock.jelly    | 48 ++++++++++++-------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/core/src/main/resources/lib/form/optionalBlock.jelly b/core/src/main/resources/lib/form/optionalBlock.jelly
index 5602254766..37039e0e2a 100644
--- a/core/src/main/resources/lib/form/optionalBlock.jelly
+++ b/core/src/main/resources/lib/form/optionalBlock.jelly
@@ -35,6 +35,10 @@ THE SOFTWARE.
     </st:attribute>
     <st:attribute name="title">
       Human readable text that follows the checkbox.
+
+      If this field is null, the checkbox degrades to a &lt;f:rowSet>, which provides
+      a grouping at JSON level but on the UI there's no checkbox (and you always see
+      the body of it.)
     </st:attribute>
     <st:attribute name="field">
       Used for databinding. TBD. Either this or @name/@title combo is required.
@@ -59,21 +63,31 @@ THE SOFTWARE.
            value="${descriptor.getHelpFile(attrs.field)}" />
   </j:if>
 
-  <tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
-    <td colspan="3">
-      <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)"
-                  negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" />
-    </td>
-    <j:if test="${attrs.help!=null}">
-      <td>
-        <a href="#" class="help-button" helpURL="${rootURL}${attrs.help}"><img src="${imagesURL}/16x16/help.gif" alt="Help for feature: ${title}" /></a>
-      </td>
-    </j:if>
-  </tr>
-  <j:if test="${attrs.help!=null}">
-    <f:helpArea />
-  </j:if>
-  <d:invokeBody />
-  <!-- end marker -->
-  <tr class="${attrs.inline?'':'row-set-end'} optional-block-end" />
+  <j:choose>
+    <j:when test="${attrs.title!=null}">
+      <tr class="optional-block-start ${attrs.inline?'':'row-set-start'}" hasHelp="${attrs.help!=null}"><!-- this ID marks the beginning -->
+        <td colspan="3">
+          <f:checkbox name="${attrs.name}" onclick="javascript:updateOptionalBlock(this,true)"
+                      negative="${attrs.negative}" checked="${attrs.checked}" field="${attrs.field}" title="${title}" />
+        </td>
+        <j:if test="${attrs.help!=null}">
+          <td>
+            <a href="#" class="help-button" helpURL="${rootURL}${attrs.help}"><img src="${imagesURL}/16x16/help.gif" alt="Help for feature: ${title}" /></a>
+          </td>
+        </j:if>
+      </tr>
+      <j:if test="${attrs.help!=null}">
+        <f:helpArea />
+      </j:if>
+      <d:invokeBody />
+      <!-- end marker -->
+      <tr class="${attrs.inline?'':'row-set-end'} optional-block-end" />
+    </j:when>
+
+    <j:otherwise>
+      <f:rowSet name="${attrs.name}">
+        <d:invokeBody />
+      </f:rowSet>
+    </j:otherwise>
+  </j:choose>
 </j:jelly>
\ No newline at end of file
-- 
GitLab