Merge pull request #18772 from nextcloud/backport/18766/stable18
[stable18] Filter disabled operations out of the rule list
This commit is contained in:
commit
18315f44b8
5 changed files with 3 additions and 2 deletions
Binary file not shown.
Binary file not shown.
|
@ -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)
|
||||
}
|
||||
|
|
|
@ -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" />
|
||||
|
|
|
@ -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
|
||||
})
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue