Merge branch 'wip-MDL-56912-32' of git://github.com/marinaglancy/mood…

…le into MOODLE_32_STABLE
moodle · Dec 19, 2016 · 1a1eef4 · 1a1eef4
2 parents 4942dfc + f7b3774
commit 1a1eef4
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/mod/feedback/item/feedback_item_class.php b/mod/feedback/item/feedback_item_class.php
@@ -181,6 +181,7 @@ public function get_display_name_postfix($item) {
      * If it is important which mode the form is in, use $form->get_mode()
      *
      * Each item type must add a single form element with the name $item->typ.'_'.$item->id
+     * This element must always be present in form data even if nothing is selected (i.e. use advcheckbox and not checkbox).
      * To add an element use either:
      * $form->add_form_element() - adds a single element to the form
      * $form->add_form_group_element() - adds a group element to the form

diff --git a/mod/feedback/item/multichoice/lib.php b/mod/feedback/item/multichoice/lib.php
@@ -350,11 +350,16 @@ public function complete_form_element($item, $form) {
                 }
             } else {
                 // Radio.
+                if (!array_key_exists(0, $options)) {
+                    // Always add '0' as hidden element, otherwise form submit data may not have this element.
+                    $objs[] = ['hidden', $inputname.'[0]'];
+                }
                 foreach ($options as $idx => $label) {
                     $objs[] = ['radio', $inputname.'[0]', '', $label, $idx];
                 }
                 $element = $form->add_form_group_element($item, 'group_'.$inputname, $name, $objs, $separator, $class);
                 $form->set_element_default($inputname.'[0]', $tmpvalue);
+                $form->set_element_type($inputname.'[0]', PARAM_INT);
             }
         }
 

diff --git a/mod/feedback/item/multichoicerated/lib.php b/mod/feedback/item/multichoicerated/lib.php
@@ -305,12 +305,17 @@ public function complete_form_element($item, $form) {
                     ['select', $inputname, $name, array('' => '') + $options, array('class' => $class)]);
         } else {
             $objs = array();
+            if (!array_key_exists(0, $options)) {
+                // Always add '0' as hidden element, otherwise form submit data may not have this element.
+                $objs[] = ['hidden', $inputname];
+            }
             foreach ($options as $idx => $label) {
                 $objs[] = ['radio', $inputname, '', $label, $idx];
             }
             $separator = $info->horizontal ? ' ' : '<br>';
             $class .= ' multichoicerated-' . ($info->horizontal ? 'horizontal' : 'vertical');
             $el = $form->add_form_group_element($item, 'group_'.$inputname, $name, $objs, $separator, $class);
+            $form->set_element_type($inputname, PARAM_INT);
 
             // Set previously input values.
             $form->set_element_default($inputname, $form->get_item_value($item));