[LorisForm] allow files to validate #2675
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gluneau
added
the
Bug
jstirling91
suggested changes
Mar 23, 2017
php/libraries/LorisForm.class.inc
Outdated
| $value = $el['name']; | ||
| if (isset($el['required']) | ||
| && $el['required'] === true | ||
| && empty($value) |
There was a problem hiding this comment.
This will always be false, even if the file isn't submitted with the form.
jstirling91
added
the
Needs Work
…custom fail" section of validate
gluneau
removed
the
Needs Work
php/libraries/LorisForm.class.inc
Outdated
| } else if ($el['type'] === 'file') { | ||
| $value = $_FILES[$el['name']]['name']; | ||
| // $el['required'] not present in the file $el array | ||
| // the file required will get cought by "custom fail" |
There was a problem hiding this comment.
@gluneau
copy 1180 to 1186 to your code changes for additional logic
|
@jstirling91 Please re-review. |
jstirling91
approved these changes
Mar 27, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes the problem where in the else section of validate the
$value = $this->getValue($el['name']);would use the LorisForm::getValue rather than LorisFormFileElement::getValue
When using XINRules, file are always required by default, add this rule if your file element is not required:
$this->XINRegisterRule("vineland_file", array("vineland_file{@}==={@}NEVER_REQUIRED"));NOTE: the triple equal in the rule!!
I tested this with: