diff --git a/manager2/src/app/user/user.component.html b/manager2/src/app/user/user.component.html index b885917f..f16105ec 100644 --- a/manager2/src/app/user/user.component.html +++ b/manager2/src/app/user/user.component.html @@ -163,7 +163,7 @@

Information

-
@@ -359,7 +359,7 @@

Update password

aria-label="Toggle password visibility" role="button" tabindex="0" - > + > Update password
- +
@@ -422,7 +422,7 @@

Update password

aria-label="Toggle password visibility" role="button" tabindex="0" - > + > Update password
- + + diff --git a/manager2/src/app/user/user.service.ts b/manager2/src/app/user/user.service.ts index f7551861..0f73bc6f 100644 --- a/manager2/src/app/user/user.service.ts +++ b/manager2/src/app/user/user.service.ts @@ -42,6 +42,9 @@ export class User { extra_info: any[] status: string temp: any + loginShell: string + maingroup: string + uidnumber: number constructor( uid: string = '', id: number = 0, first_name: string = '', last_name: string = '', @@ -53,7 +56,8 @@ export class User { group: string = '', secondary_groups: string[] = [], new_group: string = '', projects: string[] = null, new_project: any = null, tags: any = null, reg_key: number = 0, api_key: number = 0, ssh: string = '', u2f: any = null, otp: any = null, - history: any[] = [], extra_info: any[] = [], status: string = '', temp: any = null + history: any[] = [], extra_info: any[] = [], status: string = '', temp: any = null, loginShell: string = '', + maingroup: string = "", uidnumber: number = 0 ) { this.uid = uid; this.id = id; this.firstname = first_name; this.lastname = last_name; this.email = email; this.lab = lab; this.responsible = responsible; this.address = address; @@ -65,6 +69,7 @@ export class User { this.projects = projects; this.newproject = new_project; this.tags = tags; this.regkey = reg_key; this.apikey = api_key; this.ssh = ssh; this.u2f = u2f; this.otp = otp; this.history = history; this.extra_info = extra_info; this.status = status; this.temp = temp; + this.loginShell = loginShell; this.maingroup = maingroup; this.uidnumber = uidnumber } } @@ -90,7 +95,9 @@ export class UserService { resp.group || '', resp.secondarygroups || [], resp.newgroup || '', resp.projects || null, resp.newproject || null, resp.tags || null, resp.regkey || 0, resp.apikey || 0, resp.ssh || '', resp.u2f || null, resp.otp || null, - resp.history || [], resp.extra_info || [], resp.status || '', resp.temp || null + resp.history || [], resp.extra_info || [], resp.status || '', resp.temp || null, resp.loginShell || '', + resp.maingroup || '', resp.uidnumber || 0 + ); }