diff --git a/src/app/settings/user-admin/user-admin.component.ts b/src/app/settings/user-admin/user-admin.component.ts index fe9ca38..342e870 100644 --- a/src/app/settings/user-admin/user-admin.component.ts +++ b/src/app/settings/user-admin/user-admin.component.ts @@ -42,7 +42,7 @@ export class UserAdmin { this.users = []; this.boards = []; - this.modalProps = new ModalProperties('', '', new ModalUser()); + this.modalProps = new ModalProperties('', '', new ModalUser(new User())); auth.userChanged .subscribe(activeUser => { @@ -180,7 +180,7 @@ export class UserAdmin { this.modalProps = { title: title, prefix: isAdd ? '' : 'Change', - user: isAdd ? new ModalUser() : user + user: isAdd ? new ModalUser(new User()) : new ModalUser(user) } this.modal.open(this.MODAL_ID); diff --git a/src/app/settings/user-admin/user-admin.models.ts b/src/app/settings/user-admin/user-admin.models.ts index e3d86e8..a1fcc19 100644 --- a/src/app/settings/user-admin/user-admin.models.ts +++ b/src/app/settings/user-admin/user-admin.models.ts @@ -9,7 +9,17 @@ export class UserDisplay extends User { export class ModalUser extends UserDisplay { public password: string = ''; public verifyPassword: string = ''; - public boardAccess: Array = []; + public boardAccess: Array = []; + + constructor(user: User) { + super(user.default_board_id, user.email, user.id, + user.last_login, user.security_level, user.user_option_id, + user.username, user.board_access); + + user.board_access.forEach((id) => { + this.boardAccess.push('' + id); + }); + } } export class ModalProperties { diff --git a/src/app/shared/models/user.model.ts b/src/app/shared/models/user.model.ts index e65e34f..8e7776f 100644 --- a/src/app/shared/models/user.model.ts +++ b/src/app/shared/models/user.model.ts @@ -6,7 +6,7 @@ export class User { public security_level: number = 3, public user_option_id: number = 0, public username: string = '', - public board_acccess: Array = []) { + public board_access: Array = []) { } }