user permission fix #45

Merged
naeem.ullah merged 1 commits from mazdak/UX-2123 into dev-pending-20-01-2026 2 weeks ago

@ -23,10 +23,9 @@
<div class="bg-primary bg-soft text-center py-3 mt-2"> <div class="bg-primary bg-soft text-center py-3 mt-2">
<img src="assets/images/logo.png" class="img-fluid mb-2" height="120" width="150" alt="Logo"> <img src="assets/images/logo.png" class="img-fluid mb-2" height="120" width="150" alt="Logo">
</div> </div>
<h2 class="text-center fw-semibold my-3"> <!-- <h2 class="text-center fw-semibold my-3">
aConnect aConnect
</h2> </h2> -->
<div class="card-body"> <div class="card-body">
<form [formGroup]="loginForm" class="form-horizontal"> <form [formGroup]="loginForm" class="form-horizontal">
<div class="mb-3"> <div class="mb-3">

@ -193,6 +193,7 @@ ngOnInit(): void {
userRole: response.role, userRole: response.role,
defaultPassword: '' defaultPassword: ''
}); });
this.userForm.disable();
this.selectedUserId = userId; this.selectedUserId = userId;
this.isLoading = false; this.isLoading = false;
}, },

@ -20,7 +20,7 @@
placeholder="{{ 'choose' | translate }}" placeholder="{{ 'choose' | translate }}"
(change)="onUserChange()" (change)="onUserChange()"
[searchable]="true" [searchable]="true"
[clearable]="true" [clearable]="false"
[dropdownPosition]="'auto'" [dropdownPosition]="'auto'"
[virtualScroll]="true" [virtualScroll]="true"
[bufferAmount]="10"> [bufferAmount]="10">

@ -151,7 +151,7 @@ export class UserPermissionsComponent {
} }
this.httpService.requestPUT(URIKey.USER_SAVE_PERMISSION, payload).subscribe((response: any) => { this.httpService.requestPUT(URIKey.USER_SAVE_PERMISSION, payload).subscribe((response: any) => {
if (!(response instanceof HttpErrorResponse)) { if (!(response instanceof HttpErrorResponse)) {
this.i18nService.success(SuccessMessages.SAVED_SUCESSFULLY, []); this.i18nService.success(SuccessMessages.SAVED_SUCCESSFULLY, []);
this.permission.reset(); this.permission.reset();
this.permission.get('userCode')?.setValue(""); this.permission.get('userCode')?.setValue("");
this.showPermissions = false; this.showPermissions = false;

@ -50,8 +50,6 @@ export enum HiddenValues {
} }
export enum SuccessMessages { export enum SuccessMessages {
SAVED_SUCESSFULLY = "SUC_APP_F_0001",
LOGIN_SUCCESSFULLY = "LOGIN_SUCCESSFULLY", LOGIN_SUCCESSFULLY = "LOGIN_SUCCESSFULLY",
RESET_PASSWORD_SUCCESS ="RESET_PASSWORD_SUCCESS", RESET_PASSWORD_SUCCESS ="RESET_PASSWORD_SUCCESS",
CHANGE_PASSWORD_SUCCESS ="CHANGE_PASSWORD_SUCCESS", CHANGE_PASSWORD_SUCCESS ="CHANGE_PASSWORD_SUCCESS",
@ -62,7 +60,6 @@ ACCOUNT_CLOSED_SUCCESSFULLY = "ACCOUNT_CLOSED_SUCCESSFULLY",
SUCCESS_MESSAGE = "SUCCESS_MESSAGE", SUCCESS_MESSAGE = "SUCCESS_MESSAGE",
USER_CREATED_SUCCESS = "USER_CREATED_SUCCESS", USER_CREATED_SUCCESS = "USER_CREATED_SUCCESS",
USER_DELETE_SUCCESS = "USER_DELETE_SUCCESS" USER_DELETE_SUCCESS = "USER_DELETE_SUCCESS"
} }
export enum MESSAGEKEY { export enum MESSAGEKEY {

@ -265,6 +265,7 @@
"nameMinLength": "يجب أن يكون الاسم مكوّنًا من 5 أحرف على الأقل", "nameMinLength": "يجب أن يكون الاسم مكوّنًا من 5 أحرف على الأقل",
"emptySpaceRestriction": "المسافات الفارغة غير مسموح بها", "emptySpaceRestriction": "المسافات الفارغة غير مسموح بها",
"USER_CREATED_SUCCESS": "تم إنشاء المستخدم", "USER_CREATED_SUCCESS": "تم إنشاء المستخدم",
"USER_DELETE_SUCCESS": "تم حذف المستخدم" "USER_DELETE_SUCCESS": "تم حذف المستخدم",
"SAVED_SUCCESSFULLY": "تم الحفظ بنجاح"
} }

@ -268,5 +268,6 @@
"emptySpaceRestriction" : "Empty spaces are not allowed", "emptySpaceRestriction" : "Empty spaces are not allowed",
"USER_CREATED_SUCCESS": "User Created", "USER_CREATED_SUCCESS": "User Created",
"USER_DELETE_SUCCESS": "User Deleted", "USER_DELETE_SUCCESS": "User Deleted",
"SAVED_SUCCESSFULLY" :"Saved Successfully",
"oldAndNewPass":"Old password and new password cannot be the same" "oldAndNewPass":"Old password and new password cannot be the same"
} }
Loading…
Cancel
Save