mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #18766 from nextcloud/bugfix/workflow-filter-store 

Filter disabled operations out of the rule list
This commit is contained in:
blizzz 2020-01-09 12:11:22 +01:00 committed by GitHub
parent 1437c21d51 302fd1ae05
commit 31c74e87c8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
apps/workflowengine/js/workflowengine.js
View File

File diff suppressed because one or more lines are too long

2
apps/workflowengine/js/workflowengine.js.map
View File

File diff suppressed because one or more lines are too long

1
apps/workflowengine/src/components/Check.vue
View File

@ -121,6 +121,7 @@ export default {
this.deleteVisible = false this.deleteVisible = false
}, },
validate() { validate() {
this.valid = true
if (this.currentOption && this.currentOption.validate) { if (this.currentOption && this.currentOption.validate) {
this.valid = !!this.currentOption.validate(this.check) this.valid = !!this.currentOption.validate(this.check)
} }

2
apps/workflowengine/src/components/Rule.vue
View File

@ -19,7 +19,7 @@
type="button" type="button"
class="check--add" class="check--add"
value="Add a new filter" 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> </p>
</div> </div>
<div class="flow-icon icon-confirm" /> <div class="flow-icon icon-confirm" />

2
apps/workflowengine/src/store.js
View File

@ -138,7 +138,7 @@ const store = new Vuex.Store({
}, },
getters: { getters: {
getRules(state) { 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 return rule1.id - rule2.id || rule2.class - rule1.class
}) })
}, },