Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(fieldsfield): mandatory check failure on dropdowns #3501

Merged
merged 1 commit into from
Apr 23, 2024
Merged

fix(fieldsfield): mandatory check failure on dropdowns #3501

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion inc/field/fieldsfield.class.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -483,7 +483,7 @@ public function isValidValue($value): bool {
public function isValid(): bool {
if (!is_null($this->getField())) {
// If the field is required it can't be empty
if ($this->getField()->fields['mandatory'] && $this->value == '') {
if ($this->isAdditionalFieldEmpty()) {
Session::addMessageAfterRedirect(
__('A required field is empty:', 'formcreator') . ' ' . $this->getLabel(),
false,
Expand All @@ -498,6 +498,20 @@ public function isValid(): bool {
return true;
}

/**
* Undocumented function
*
* @return boolean
*/
private function isAdditionalFieldEmpty(): bool {
switch ($this->getField()->fields['type']) {
case 'dropdown':
return $this->getField()->fields['mandatory'] && $this->value == 0;
}

return $this->getField()->fields['mandatory'] && $this->value == '';
}

public function moveUploads() {

}
Expand Down
Loading