wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve multiselect handling on twofactor settings

Browse source 
Signed-off-by: Joas Schilling <coding@schilljs.com>
This commit is contained in:
Joas Schilling 2019-02-27 13:57:18 +01:00 committed by Roeland Jago Douma
parent 49b104f3df
commit 6ad51a2990
No known key found for this signature in database
GPG key ID: F941078878347C0C
10 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
settings/js/vue-0.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/vue-6.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/vue-7.js
View file

File diff suppressed because one or more lines are too long

26
settings/js/vue-settings-admin-security.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/vue-settings-admin-security.js.map
View file

File diff suppressed because one or more lines are too long

8
settings/js/vue-settings-apps-users-management.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/vue-settings-apps-users-management.js.map
View file

File diff suppressed because one or more lines are too long

10
settings/js/vue-settings-personal-security.js
View file

File diff suppressed because one or more lines are too long

2
settings/js/vue-settings-personal-security.js.map
View file

File diff suppressed because one or more lines are too long

8
settings/src/components/AdminTwoFactor.vue
View file

@ -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),