Przeglądaj źródła

Fix submission issue in test forms when template keys are not used

Alan Lam 6 lat temu
rodzic
commit
ef1d27de2b
2 zmienionych plików z 14 dodań i 2 usunięć
  1. 3 0
      controllers/practice.php
  2. 11 2
      controllers/test.php

+ 3 - 0
controllers/practice.php

@@ -88,6 +88,9 @@ if($submit) {
 			$name = $field->name ?? false;
 			$name = $field->name ?? false;
 			if(empty($name)) continue; // Not a field
 			if(empty($name)) continue; // Not a field
 
 
+			$required_key = $field->requiredKey ?? null;
+			if($required_key) continue;
+
 			$label = $field->label ?? "";
 			$label = $field->label ?? "";
 			$type = $field->type;
 			$type = $field->type;
 			$required = $field->required ?? false;
 			$required = $field->required ?? false;

+ 11 - 2
controllers/test.php

@@ -22,7 +22,8 @@ $template = $project->getTemplate();
 $template_overrides = $project->getTemplateOverrides();
 $template_overrides = $project->getTemplateOverrides();
 if($template_overrides) $template->setOverrides($template_overrides);
 if($template_overrides) $template->setOverrides($template_overrides);
 
 
-$template->setKeys($project->getTemplateKeys());
+$template_keys = $project->getTemplateKeys();
+$template->setKeys($template_keys);
 
 
 $page_title = $location->name;
 $page_title = $location->name;
 
 
@@ -99,6 +100,9 @@ if(Core::$user->level == User::LEVEL_TESTER) {
 				$name = $field->name ?? false;
 				$name = $field->name ?? false;
 				if(empty($name)) continue; // Not a field
 				if(empty($name)) continue; // Not a field
 
 
+				$required_key = $field->requiredKey ?? null;
+				if($required_key && !in_array($required_key, $template_keys)) continue;
+
 				$label = $field->label ?? "";
 				$label = $field->label ?? "";
 				$type = $field->type;
 				$type = $field->type;
 				$required = $field->required ?? false;
 				$required = $field->required ?? false;
@@ -330,9 +334,14 @@ else if(Core::$user->level >= User::LEVEL_ADMIN) {
 				if($field->type == "file") continue;
 				if($field->type == "file") continue;
 				if(empty($field->name)) continue;
 				if(empty($field->name)) continue;
 
 
+				$required_key = $field->requiredKey ?? null;
+				if($required_key && !in_array($required_key, $template_keys)) continue;
+
 				$value = http::value($field->name, "trim");
 				$value = http::value($field->name, "trim");
 
 
-				if(in_array($field->name, Test::TEST_FIELDS)) $test->{$field->name} = $value;
+				if(in_array($field->name, Test::TEST_FIELDS)) {
+					$test->{$field->name} = $value;
+				}
 				else {
 				else {
 					$test_value = TestValue::get($id, $field->name);
 					$test_value = TestValue::get($id, $field->name);
 					if(!$test_value) {
 					if(!$test_value) {