mirror of
https://github.com/nextcloud/server.git
synced 2026-04-20 22:00:39 -04:00
Merge pull request #14405 from nextcloud/bugfix/14403/improve-multiselect-on-twofactor-settings
Improve multiselect handling on twofactor settings
This commit is contained in:
commit
34677082d8
10 changed files with 34 additions and 30 deletions
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
|
@ -94,7 +94,11 @@
|
|||
mounted () {
|
||||
// Groups are loaded dynamically, but the assigned ones *should*
|
||||
// be valid groups, so let's add them as initial state
|
||||
this.groups = _.sortedUniq(this.state.enforcedGroups.concat(this.state.excludedGroups))
|
||||
this.groups = _.sortedUniq(_.uniq(this.state.enforcedGroups.concat(this.state.excludedGroups)))
|
||||
|
||||
// Populate the groups with a first set so the dropdown is not empty
|
||||
// when opening the page the first time
|
||||
this.searchGroup('')
|
||||
},
|
||||
methods: {
|
||||
searchGroup: _.debounce(function (query) {
|
||||
|
|
@ -102,7 +106,7 @@
|
|||
Axios.get(OC.linkToOCS(`cloud/groups?offset=0&search=${encodeURIComponent(query)}&limit=20`, 2))
|
||||
.then(res => res.data.ocs)
|
||||
.then(ocs => ocs.data.groups)
|
||||
.then(groups => this.groups = _.sortedUniq(this.groups.concat(groups)))
|
||||
.then(groups => this.groups = _.sortedUniq(_.uniq(this.groups.concat(groups))))
|
||||
.catch(err => console.error('could not search groups', err))
|
||||
.then(() => this.loadingGroups = false)
|
||||
}, 500),
|
||||
|
|
|
|||
Loading…
Reference in a new issue