Changeset 4867f3 in indico

Timestamp:

09/30/11 16:47:42 (20 months ago)

Author:

Pedro Ferreira <jose.pedro.ferreira@…>

Branches:

master, hello-world-walkthrough, ipv6, v0.98-series, v0.98.2, v0.98.3, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

eb968d

Parents:

3edc62

git-author:

Adrian Moennich <jerome.ernst.monnich@…> (09/30/11 12:09:41)

git-committer:

Pedro Ferreira <jose.pedro.ferreira@…> (09/30/11 16:47:42)

Message:

[FIX] mandatory checkboxes in regform

Location:

indico

Files:

• MaKaC/registration.py (modified) (2 diffs)
• htdocs/js/indico/Legacy/Util.js (modified) (1 diff)

indico/MaKaC/registration.py

@@ -1700 +1700 @@
         if ( registrant is not None and billable and registrant.getPayed()) or (not self.getParent().hasAvailablePlaces() and not quantity):
             disable="disabled=\"disabled\""
-            #pass
         if v=="yes":
             checked="checked=\"checked\""
-
-        tmp = """<input type="checkbox" id="%s" name="%s" %s %s> %s""" % (htmlName, htmlName, checked, disable, caption)
+        pm = ''
+        if self._parent.isMandatory():
+            pm = """<script>addParam($E('%s'), 'checkBox', false);</script>""" % htmlName
+        tmp = """<input type="checkbox" id="%s" name="%s" %s %s> %s%s""" % (htmlName, htmlName, checked, disable, caption, pm)
         tmp= """ <td>%s</td><td align="right" align="bottom">"""%tmp
         if billable:
@@ -1724 +1725 @@
             item.setValue("yes")
             item.setQuantity(1)
+        elif not override and self.getParent().isMandatory():
+            raise FormValuesError(_('The checkbox "%s" is mandatory. Please enable it.') % self.getParent().getCaption())
         else:
             item.setValue("no")

indico/htdocs/js/indico/Legacy/Util.js

@@ -567 +567 @@
                     }
                 }
+                else if (dataType == 'checkBox' && !exists(extraCheckFunction)) {
+                    if (!allowEmpty && !component.dom.checked) {
+                        error = Html.span({}, $T("Please enable the checkbox"));
+                    }
+                }
                 else if (dataType == "radio" && !exists(extraCheckFunction)) {
                     if (!allowEmpty && !self.checkRadioButton(component)) {