Fixed user form for groups with ids greater than 9
This commit is contained in:
parent
4ff7d0b7dc
commit
f479a7a1ab
@ -1479,6 +1479,7 @@ img {
|
|||||||
vertical-align: top;
|
vertical-align: top;
|
||||||
text-align: center;
|
text-align: center;
|
||||||
min-width: 40px;
|
min-width: 40px;
|
||||||
|
overflow: hidden;
|
||||||
}
|
}
|
||||||
|
|
||||||
#groups-table .perm-head {
|
#groups-table .perm-head {
|
||||||
|
@ -335,9 +335,8 @@ angular.module('OpenSlidesApp.users.site', [
|
|||||||
type: 'select-multiple',
|
type: 'select-multiple',
|
||||||
templateOptions: {
|
templateOptions: {
|
||||||
label: gettextCatalog.getString('Groups'),
|
label: gettextCatalog.getString('Groups'),
|
||||||
options: Group.getAll(),
|
options: Group.filter({where: {id: {'>': 1}}}),
|
||||||
ngOptions: 'option.id as option.name | translate for option in to.options | ' +
|
ngOptions: "option.id as option.name | translate for option in to.options | orderBy: 'id'",
|
||||||
'filter: {id: "!1"}',
|
|
||||||
placeholder: gettextCatalog.getString('Select or search a group ...')
|
placeholder: gettextCatalog.getString('Select or search a group ...')
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
@ -784,10 +783,8 @@ angular.module('OpenSlidesApp.users.site', [
|
|||||||
'$state',
|
'$state',
|
||||||
'User',
|
'User',
|
||||||
'UserForm',
|
'UserForm',
|
||||||
'Group',
|
|
||||||
'ErrorMessage',
|
'ErrorMessage',
|
||||||
function($scope, $state, User, UserForm, Group, ErrorMessage) {
|
function($scope, $state, User, UserForm, ErrorMessage) {
|
||||||
Group.bindAll({where: {id: {'>': 2}}}, $scope, 'groups');
|
|
||||||
$scope.alert = {};
|
$scope.alert = {};
|
||||||
// get all form fields
|
// get all form fields
|
||||||
$scope.formFields = UserForm.getFormFields(true);
|
$scope.formFields = UserForm.getFormFields(true);
|
||||||
@ -814,11 +811,9 @@ angular.module('OpenSlidesApp.users.site', [
|
|||||||
'$state',
|
'$state',
|
||||||
'User',
|
'User',
|
||||||
'UserForm',
|
'UserForm',
|
||||||
'Group',
|
|
||||||
'userId',
|
'userId',
|
||||||
'ErrorMessage',
|
'ErrorMessage',
|
||||||
function($scope, $state, User, UserForm, Group, userId, ErrorMessage) {
|
function($scope, $state, User, UserForm, userId, ErrorMessage) {
|
||||||
Group.bindAll({where: {id: {'>': 2}}}, $scope, 'groups');
|
|
||||||
$scope.alert = {};
|
$scope.alert = {};
|
||||||
// set initial values for form model by create deep copy of user object
|
// set initial values for form model by create deep copy of user object
|
||||||
// so list/detail view is not updated while editing
|
// so list/detail view is not updated while editing
|
||||||
|
Loading…
Reference in New Issue
Block a user