From 5d7370e4af12c27fdfb4fff3d311f89a71aed1da Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Wed, 29 Nov 2023 13:31:01 +0100 Subject: [PATCH] Form Validation reverse Arguments --- public/js/components/Form/Form.js | 10 +++++----- public/js/components/Form/Input.js | 4 +++- public/js/components/Form/Validation.js | 4 +++- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/public/js/components/Form/Form.js b/public/js/components/Form/Form.js index bf9e318c0..9ca6af7e3 100644 --- a/public/js/components/Form/Form.js +++ b/public/js/components/Form/Form.js @@ -37,7 +37,7 @@ export default { methods: { _sendFeedbackToInput(inputs, feedback, valid) { if (inputs.length) { - inputs.forEach(input => input.setFeedback(feedback, valid)); + inputs.forEach(input => input.setFeedback(valid, feedback)); return false; } if (this.$fhcAlert) { @@ -46,7 +46,7 @@ export default { } return true; }, - setFeedback(feedback, valid) { + setFeedback(valid, feedback) { if (Array.isArray(feedback)) { let remaining = feedback.filter(fb => this._sendFeedbackToInput( @@ -91,7 +91,7 @@ export default { const data = result.data.retval; // TODO(chris): check for something better/add new standardized return value if (result.data.code == 1) - this.setFeedback(data, true); + this.setFeedback(true, data); return resolve(data); } // TODO(chris): IMPLEMENT! Wrong result object @@ -103,8 +103,8 @@ export default { return reject(result); this.clearValidation(); const remaining = this.setFeedback( - result.response.data.retval, - false + false, + result.response.data.retval ); if (remaining) { result.response.data.retval = remaining; diff --git a/public/js/components/Form/Input.js b/public/js/components/Form/Input.js index 6b3ed5eb1..46ddbd3c5 100644 --- a/public/js/components/Form/Input.js +++ b/public/js/components/Form/Input.js @@ -121,7 +121,9 @@ export default { this.valid = undefined; this.feedback = []; }, - setFeedback(feedback, valid) { + setFeedback(valid, feedback) { + if (!feedback) + feedback = []; if (!Array.isArray(feedback)) feedback = [feedback]; this.valid = valid; diff --git a/public/js/components/Form/Validation.js b/public/js/components/Form/Validation.js index 51ea3c689..8e8be6afa 100644 --- a/public/js/components/Form/Validation.js +++ b/public/js/components/Form/Validation.js @@ -15,7 +15,9 @@ export default { clearValidation() { this.feedback = FEEDBACK_DEFAULT; }, - setFeedback(feedback, valid) { + setFeedback(valid, feedback) { + if (!feedback) + feedback = []; if (!Array.isArray(feedback)) feedback = [feedback]; this.feedback[valid ? 'success' : 'danger'] = feedback;