Browse Source

Fixed IE design, subadmins groups update and multiselect base width

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
tags/v14.0.0beta1
John Molakvoæ (skjnldsv) 6 years ago
parent
commit
aa1c6fb6b4
No account linked to committer's email address

+ 1
- 2
core/css/inputs.scss View File

@@ -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 {

+ 0
- 1
settings/Controller/UsersController.php View File

@@ -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;

+ 2
- 0
settings/css/settings.scss View File

@@ -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;

+ 2
- 2
settings/js/main.js
File diff suppressed because it is too large
View File


+ 1
- 1
settings/js/main.js.map
File diff suppressed because it is too large
View File


+ 1
- 1
settings/src/components/userList.vue View File

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

+ 4
- 0
settings/src/store/users.js View File

@@ -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;
},

+ 1
- 1
settings/src/views/Users.vue View File

@@ -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
});

Loading…
Cancel
Save