Browse Source
Fixed IE design, subadmins groups update and multiselect base width
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
pull/9555/head
John Molakvoæ (skjnldsv)
8 years ago
No known key found for this signature in database
GPG Key ID: 60C25B8C072916CF
8 changed files with
12 additions and
8 deletions
-
core/css/inputs.scss
-
settings/Controller/UsersController.php
-
settings/css/settings.scss
-
settings/js/main.js
-
settings/js/main.js.map
-
settings/src/components/userList.vue
-
settings/src/store/users.js
-
settings/src/views/Users.vue
|
|
|
@ -626,8 +626,7 @@ input { |
|
|
|
margin: 1px 2px; |
|
|
|
padding: 0 !important; |
|
|
|
display: inline-block; |
|
|
|
/* min-width: 160px; */ |
|
|
|
/* width: 160px; */ |
|
|
|
width: 160px; |
|
|
|
position: relative; |
|
|
|
background-color: $color-main-background; |
|
|
|
&.multiselect--active { |
|
|
|
|
|
|
|
@ -239,7 +239,6 @@ class UsersController extends Controller { |
|
|
|
$serverData = array(); |
|
|
|
// groups
|
|
|
|
$serverData['groups'] = array_merge_recursive($adminGroup, [$disabledUsersGroup], $groups); |
|
|
|
$serverData['subadmingroups'] = $groups; |
|
|
|
// Various data
|
|
|
|
$serverData['isAdmin'] = $this->isAdmin; |
|
|
|
$serverData['subadmins'] = $subAdmins; |
|
|
|
|
|
|
|
@ -1282,6 +1282,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper { |
|
|
|
grid-column-gap: 20px; |
|
|
|
.row { |
|
|
|
// TODO replace with css4 subgrid when available |
|
|
|
// fallback for ie11 no grid |
|
|
|
display: flex; |
|
|
|
display: grid; |
|
|
|
grid-row-start: span 1; |
|
|
|
grid-gap: 3px; |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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; |
|
|
|
}, |
|
|
|
|
|
|
|
@ -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 |
|
|
|
}); |
|
|
|
|