From 02fbd0984edc4699a4e53189aeede8ac0cf3b84a Mon Sep 17 00:00:00 2001 From: tanshu Date: Mon, 11 May 2020 22:42:13 +0530 Subject: [PATCH] Updated to reflect renamed schemas --- .../app/user/user-detail/user-detail.component.html | 6 +++--- .../app/user/user-detail/user-detail.component.ts | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/overlord/src/app/user/user-detail/user-detail.component.html b/overlord/src/app/user/user-detail/user-detail.component.html index 61c05eb0..4a4dc864 100644 --- a/overlord/src/app/user/user-detail/user-detail.component.html +++ b/overlord/src/app/user/user-detail/user-detail.component.html @@ -25,11 +25,11 @@ Is Locked Out? -
-
+
- {{g.name}} + {{r.name}}
diff --git a/overlord/src/app/user/user-detail/user-detail.component.ts b/overlord/src/app/user/user-detail/user-detail.component.ts index af37ece3..b549bb95 100644 --- a/overlord/src/app/user/user-detail/user-detail.component.ts +++ b/overlord/src/app/user/user-detail/user-detail.component.ts @@ -36,7 +36,7 @@ export class UserDetailComponent implements OnInit, AfterViewInit { name: '', password: '', lockedOut: '', - groups: this.fb.array([]) + roles: this.fb.array([]) }); } @@ -52,10 +52,10 @@ export class UserDetailComponent implements OnInit, AfterViewInit { this.form.get('name').setValue(item.name); this.form.get('password').setValue(''); this.form.get('lockedOut').setValue(item.lockedOut); - this.form.setControl('groups', this.fb.array( - item.groups.map( + this.form.setControl('roles', this.fb.array( + item.roles.map( x => this.fb.group({ - group: x.enabled + role: x.enabled }) ) )); @@ -112,8 +112,8 @@ export class UserDetailComponent implements OnInit, AfterViewInit { this.item.name = formModel.name; this.item.password = formModel.password; this.item.lockedOut = formModel.lockedOut; - const array = this.form.get('groups') as FormArray; - this.item.groups.forEach((item, index) => { + const array = this.form.get('roles') as FormArray; + this.item.roles.forEach((item, index) => { item.enabled = array.controls[index].value.group; }); return this.item;