Merge branch 'wip-MDL-51108-master' of git://github.com/abgreeve/moodle

[moodle.git] / mod / data / lib.php

diff --git a/mod/data/lib.php b/mod/data/lib.php
index d1075a9..0fe4a23 100644 (file)
--- a/mod/data/lib.php
+++ b/mod/data/lib.php
@@ -3874,6 +3874,7 @@ function data_process_submission(stdClass $mod, $fields, stdClass $datarecord) {
     // Empty form checking - you can't submit an empty form.
     $emptyform = true;
     $requiredfieldsfilled = true;
     // Empty form checking - you can't submit an empty form.
     $emptyform = true;
     $requiredfieldsfilled = true;

+    $fieldsvalidated = true;

 
     // Store the notifications.
     $result->generalnotifications = array();
 
     // Store the notifications.
     $result->generalnotifications = array();


@@ -3911,6 +3912,14 @@ function data_process_submission(stdClass $mod, $fields, stdClass $datarecord) {
 
         $field = data_get_field($fieldrecord, $mod);
         if (isset($submitteddata[$fieldrecord->id])) {
 
         $field = data_get_field($fieldrecord, $mod);
         if (isset($submitteddata[$fieldrecord->id])) {

+            // Field validation check.
+            if (method_exists($field, 'field_validation')) {
+                $errormessage = $field->field_validation($submitteddata[$fieldrecord->id]);
+                if ($errormessage) {
+                    $result->fieldnotifications[$field->field->name][] = $errormessage;
+                    $fieldsvalidated = false;
+                }
+            }

             foreach ($submitteddata[$fieldrecord->id] as $fieldname => $value) {
                 if ($field->notemptyfield($value->value, $value->fieldname)) {
                     // The field has content and the form is not empty.
             foreach ($submitteddata[$fieldrecord->id] as $fieldname => $value) {
                 if ($field->notemptyfield($value->value, $value->fieldname)) {
                     // The field has content and the form is not empty.


@@ -3942,7 +3951,7 @@ function data_process_submission(stdClass $mod, $fields, stdClass $datarecord) {
         $result->generalnotifications[] = get_string('emptyaddform', 'data');
     }
 
         $result->generalnotifications[] = get_string('emptyaddform', 'data');
     }
 

-    $result->validated = $requiredfieldsfilled && !$emptyform;
+    $result->validated = $requiredfieldsfilled && !$emptyform && $fieldsvalidated;

 
     return $result;
 }
 
     return $result;
 }