diff options
| author | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-23 09:43:33 +0200 |
|---|---|---|
| committer | John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> | 2018-05-23 09:43:33 +0200 |
| commit | aa1c6fb6b49faeb9966941e2f4fccadc3e9d76a0 (patch) | |
| tree | 88025f0dadb13efb71d6a71fc583a80031b4c93b /settings/src | |
| parent | 4bbad8f88a0c62477cae8116b296d584b46ed8e6 (diff) | |
| download | nextcloud-server-aa1c6fb6b49faeb9966941e2f4fccadc3e9d76a0.tar.gz nextcloud-server-aa1c6fb6b49faeb9966941e2f4fccadc3e9d76a0.zip | |
Fixed IE design, subadmins groups update and multiselect base width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Diffstat (limited to 'settings/src')
| -rw-r--r-- | settings/src/components/userList.vue | 2 | ||||
| -rw-r--r-- | settings/src/store/users.js | 4 | ||||
| -rw-r--r-- | settings/src/views/Users.vue | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/settings/src/components/userList.vue b/settings/src/components/userList.vue index cb0a6944823..ec08992e6cc 100644 --- a/settings/src/components/userList.vue +++ b/settings/src/components/userList.vue @@ -189,7 +189,7 @@ export default { }, subAdminsGroups() { // data provided php side - return this.$store.getters.getServerData.subadmingroups; + return this.$store.getters.getSubadminGroups; }, quotaOptions() { // convert the preset array into objects diff --git a/settings/src/store/users.js b/settings/src/store/users.js index f349c7b4a06..dc8b9fe1cb8 100644 --- a/settings/src/store/users.js +++ b/settings/src/store/users.js @@ -121,6 +121,10 @@ const getters = { getGroups(state) { return state.groups; }, + getSubadminGroups(state) { + // Can't be subadmin of admin or disabled + return state.groups.filter(group => group.id !== 'admin' && group.id !== 'disabled'); + }, getPasswordPolicyMinLength(state) { return state.minPasswordLength; }, diff --git a/settings/src/views/Users.vue b/settings/src/views/Users.vue index c88487635a9..0d298fd1ca3 100644 --- a/settings/src/views/Users.vue +++ b/settings/src/views/Users.vue @@ -55,7 +55,7 @@ export default { }, beforeMount() { this.$store.commit('initGroups', { - groups: this.$store.getters.getServerData.groups, + groups: this.$store.getters.getServerData.groups, orderBy: this.$store.getters.getServerData.sortGroups, userCount: this.$store.getters.getServerData.userCount }); |