Merge pull request #574 from anvithks/mod-user

Fixed the issue with modify user. Removed validation for tenant
sodafoundation · May 4, 2021 · 61ec512 · 61ec512
2 parents d0a8ba0 + 82107ae
commit 61ec512
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/app/business/identity/userList.component.ts b/src/app/business/identity/userList.component.ts
@@ -156,10 +156,10 @@ export class UserListComponent implements OnInit, AfterViewChecked {
             this.myFormGroup.controls['form_isModifyPsw'].value = false;
 
             this.myFormGroup.controls['form_username'].clearValidators();
+            this.myFormGroup.controls['form_tenant'].clearValidators();
             this.myFormGroup.controls['form_psw'].clearValidators();
             this.myFormGroup.controls['form_pswConfirm'].clearValidators();
 
-
         }else{
             this.isEditUser = false;
             this.popTitle = "Create";

diff --git a/src/app/business/identity/userList.html b/src/app/business/identity/userList.html
@@ -70,11 +70,11 @@
     </form>
 
     <p-footer *ngIf="!isEditUser">
-        <button type="button" pButton (click)="createUser()" label="OK"></button>
+        <button type="button" [disabled]="myFormGroup.invalid" pButton (click)="createUser()" label="OK"></button>
         <button type="button" pButton (click)="createUserDisplay=false" label="Cancel"></button>
     </p-footer>
     <p-footer *ngIf="isEditUser">
-        <button type="button" pButton (click)="updateUser()" label="OK"></button>
+        <button type="button" [disabled]="myFormGroup.invalid" pButton (click)="updateUser()" label="OK"></button>
         <button type="button" pButton (click)="createUserDisplay=false" label="Cancel"></button>
     </p-footer>
 </p-dialog>