diff options
| author | blizzz <blizzz@arthur-schiwon.de> | 2020-01-09 12:11:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-09 12:11:22 +0100 |
| commit | 31c74e87c88ecd8ac92e9cb40797162735cd25b1 (patch) | |
| tree | a5010c1741632086d25a2e6db5414091306bd089 /apps/workflowengine/src | |
| parent | 1437c21d51c8f72a31eb341a45ea38048a15f6f1 (diff) | |
| parent | 302fd1ae05f66159701b96e835cf8547275ff87a (diff) | |
| download | nextcloud-server-31c74e87c88ecd8ac92e9cb40797162735cd25b1.tar.gz nextcloud-server-31c74e87c88ecd8ac92e9cb40797162735cd25b1.zip | |
Merge pull request #18766 from nextcloud/bugfix/workflow-filter-store
Filter disabled operations out of the rule list
Diffstat (limited to 'apps/workflowengine/src')
| -rw-r--r-- | apps/workflowengine/src/components/Check.vue | 1 | ||||
| -rw-r--r-- | apps/workflowengine/src/components/Rule.vue | 2 | ||||
| -rw-r--r-- | apps/workflowengine/src/store.js | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/apps/workflowengine/src/components/Check.vue b/apps/workflowengine/src/components/Check.vue index c15907852e8..cfd0f034adf 100644 --- a/apps/workflowengine/src/components/Check.vue +++ b/apps/workflowengine/src/components/Check.vue @@ -121,6 +121,7 @@ export default { this.deleteVisible = false }, validate() { + this.valid = true if (this.currentOption && this.currentOption.validate) { this.valid = !!this.currentOption.validate(this.check) } diff --git a/apps/workflowengine/src/components/Rule.vue b/apps/workflowengine/src/components/Rule.vue index 7796180be6f..c6e23a8f180 100644 --- a/apps/workflowengine/src/components/Rule.vue +++ b/apps/workflowengine/src/components/Rule.vue @@ -19,7 +19,7 @@ type="button" class="check--add" value="Add a new filter" - @click="rule.checks.push({class: null, operator: null, value: null})"> + @click="rule.checks.push({class: null, operator: null, value: ''})"> </p> </div> <div class="flow-icon icon-confirm" /> diff --git a/apps/workflowengine/src/store.js b/apps/workflowengine/src/store.js index c02aa99f63a..79524ab4514 100644 --- a/apps/workflowengine/src/store.js +++ b/apps/workflowengine/src/store.js @@ -138,7 +138,7 @@ const store = new Vuex.Store({ }, getters: { getRules(state) { - return state.rules.sort((rule1, rule2) => { + return state.rules.filter((rule) => typeof state.operations[rule.class] !== 'undefined').sort((rule1, rule2) => { return rule1.id - rule2.id || rule2.class - rule1.class }) }, |