diff options
| author | Julius Härtl <jus@bitgrid.net> | 2019-10-10 11:01:49 +0200 |
|---|---|---|
| committer | Arthur Schiwon <blizzz@arthur-schiwon.de> | 2019-10-29 18:03:53 +0100 |
| commit | b15c4a3a2ea0e561ed6e892a77bbb91d9335958b (patch) | |
| tree | 5809c5af46eb1614f6b51dac891d329159a9c49a | |
| parent | 71470463c66ead616f8e481a7513f4858cb75ae3 (diff) | |
| download | nextcloud-server-b15c4a3a2ea0e561ed6e892a77bbb91d9335958b.tar.gz nextcloud-server-b15c4a3a2ea0e561ed6e892a77bbb91d9335958b.zip | |
Properly validate individual checks
Signed-off-by: Julius Härtl <jus@bitgrid.net>
| -rw-r--r-- | apps/workflowengine/src/components/Check.vue | 3 | ||||
| -rw-r--r-- | apps/workflowengine/src/components/Rule.vue | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue index 5f125772ea5..2f0bc11d18e 100644 --- a/apps/workflowengine/src/components/Check.vue +++ b/apps/workflowengine/src/components/Check.vue @@ -112,7 +112,6 @@ export default { if (this.currentOption && this.currentOption.validate) { this.valid = !!this.currentOption.validate(this.check); } - this.$store.dispatch('setValid', { rule: this.rule, valid: this.rule.valid && this.valid }) return this.valid }, updateCheck() { @@ -123,7 +122,7 @@ export default { this.check.operator = this.currentOperator.operator if (!this.validate()) { - return + this.check.invalid = !this.valid } this.$emit('update', this.check) } diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index 2be9b0fc5e5..2d3d5c8491a 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -85,7 +85,7 @@ export default { return this.$store.getters.getOperationForRule(this.rule) }, ruleStatus() { - if (this.error || !this.rule.valid) { + if (this.error || !this.rule.valid || this.rule.checks.some((check) => check.invalid === true)) { return { title: t('workflowengine', 'The configuration is invalid'), class: 'icon-close-white invalid', |