Merge branch 'MDL-31998_master' of git://github.com/grabs/moodle

2014-06-16 12:04:02 +08:00
parent bf4c212284 16ee970c94
commit b3f297df31
1 changed files with 16 additions and 0 deletions
@@ -2231,6 +2231,22 @@ function feedback_check_values($firstitem, $lastitem) {
        }
        $value = $itemobj->clean_input_value($value);

+        // If the item is not visible due to its dependency so it shouldn't be required.
+        // Many thanks to Pau Ferrer Ocaña.
+        if ($item->dependitem > 0 AND $item->required == 1) {
+            $comparevalue = false;
+            if ($feedbackcompletedtmp = feedback_get_current_completed($item->feedback, true)) {
+                $comparevalue = feedback_compare_item_value($feedbackcompletedtmp->id,
+                                                            $item->dependitem,
+                                                            $item->dependvalue,
+                                                            true);
+            }
+
+            if (!$comparevalue) {
+                $item->required = 0; // Override the required property.
+            }
+        }
+
        //check if the value is set
        if (is_null($value) AND $item->required == 1) {
            return false;