[Yanel-commits] rev 45292 - public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/java/org/wyona/yanel/impl/jelly/tags

[guillaume at wyona.com]

Author: guillaume
Date: 2009-11-03 17:39:09 +0100 (Tue, 03 Nov 2009)
New Revision: 45292

Modified:
   public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/java/org/wyona/yanel/impl/jelly/tags/CheckboxTag.java
Log:
Fix for r45177's fix... Cf. http://lists.wyona.org/pipermail/yanel-development/2009-November/004136.html


Modified: public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/java/org/wyona/yanel/impl/jelly/tags/CheckboxTag.java
===================================================================
--- public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/java/org/wyona/yanel/impl/jelly/tags/CheckboxTag.java	2009-11-03 13:52:15 UTC (rev 45291)
+++ public/yanel/contributions/resources/creatable-modifiable-deletable-v3/src/java/org/wyona/yanel/impl/jelly/tags/CheckboxTag.java	2009-11-03 16:39:09 UTC (rev 45292)
@@ -32,17 +32,11 @@
                 attributes.addAttribute(XHTML_NAMESPACE, "", "name", "CDATA", item.getName());
                 attributes.addAttribute(XHTML_NAMESPACE, "", "value", "CDATA", selection[i].getValue());
 
-                // NOTE: Allow checking upon creation
-                if (selection[i].getValue().equals("true")) {
-                    log.debug("Checked!");
+                if (isSelected(selection[i]) // checked upon creation
+                || selection[i].getValue().equals("true") // checked during filling out the form
+                ) {
                     attributes.addAttribute(XHTML_NAMESPACE, "", "checked", "CDATA", "checked");
-                } else {
-                    log.debug("NOT Checked!");
                 }
-                // NOTE: If checked during filling out the form
-                if (isSelected(selection[i])) {
-                    attributes.addAttribute(XHTML_NAMESPACE, "", "checked", "CDATA", "checked");
-                }
 
                 out.startElement("input", attributes);
                 out.writeCDATA(selection[i].getLabel());