From 6ad51a2990cf4a20e8c7384a0fa1126fa8b7796a Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 27 Feb 2019 13:57:18 +0100 Subject: Improve multiselect handling on twofactor settings Signed-off-by: Joas Schilling --- settings/src/components/AdminTwoFactor.vue | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'settings/src') diff --git a/settings/src/components/AdminTwoFactor.vue b/settings/src/components/AdminTwoFactor.vue index 0a20bf1b9e3..065ac9fbdda 100644 --- a/settings/src/components/AdminTwoFactor.vue +++ b/settings/src/components/AdminTwoFactor.vue @@ -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), -- cgit v1.2.3