Merge pull request #9555 from nextcloud/users-list-improvements
Fixed IE design, subadmins groups update and multiselect base width
This commit is contained in:
commit
9296b81c8d
|
@ -626,8 +626,7 @@ input {
|
||||||
margin: 1px 2px;
|
margin: 1px 2px;
|
||||||
padding: 0 !important;
|
padding: 0 !important;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
/* min-width: 160px; */
|
width: 160px;
|
||||||
/* width: 160px; */
|
|
||||||
position: relative;
|
position: relative;
|
||||||
background-color: $color-main-background;
|
background-color: $color-main-background;
|
||||||
&.multiselect--active {
|
&.multiselect--active {
|
||||||
|
|
|
@ -239,7 +239,6 @@ class UsersController extends Controller {
|
||||||
$serverData = array();
|
$serverData = array();
|
||||||
// groups
|
// groups
|
||||||
$serverData['groups'] = array_merge_recursive($adminGroup, [$disabledUsersGroup], $groups);
|
$serverData['groups'] = array_merge_recursive($adminGroup, [$disabledUsersGroup], $groups);
|
||||||
$serverData['subadmingroups'] = $groups;
|
|
||||||
// Various data
|
// Various data
|
||||||
$serverData['isAdmin'] = $this->isAdmin;
|
$serverData['isAdmin'] = $this->isAdmin;
|
||||||
$serverData['subadmins'] = $subAdmins;
|
$serverData['subadmins'] = $subAdmins;
|
||||||
|
|
|
@ -1282,6 +1282,8 @@ doesnotexist:-o-prefocus, .strengthify-wrapper {
|
||||||
grid-column-gap: 20px;
|
grid-column-gap: 20px;
|
||||||
.row {
|
.row {
|
||||||
// TODO replace with css4 subgrid when available
|
// TODO replace with css4 subgrid when available
|
||||||
|
// fallback for ie11 no grid
|
||||||
|
display: flex;
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-row-start: span 1;
|
grid-row-start: span 1;
|
||||||
grid-gap: 3px;
|
grid-gap: 3px;
|
||||||
|
|
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
@ -189,7 +189,7 @@ export default {
|
||||||
},
|
},
|
||||||
subAdminsGroups() {
|
subAdminsGroups() {
|
||||||
// data provided php side
|
// data provided php side
|
||||||
return this.$store.getters.getServerData.subadmingroups;
|
return this.$store.getters.getSubadminGroups;
|
||||||
},
|
},
|
||||||
quotaOptions() {
|
quotaOptions() {
|
||||||
// convert the preset array into objects
|
// convert the preset array into objects
|
||||||
|
|
|
@ -121,6 +121,10 @@ const getters = {
|
||||||
getGroups(state) {
|
getGroups(state) {
|
||||||
return state.groups;
|
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) {
|
getPasswordPolicyMinLength(state) {
|
||||||
return state.minPasswordLength;
|
return state.minPasswordLength;
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue