Marmelator/red-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1.4k Wiki Activity

RED-2473: Disable delete self in edit user dialog

Browse Source
This commit is contained in:
Adina Țeudan 2021-10-15 13:56:08 +03:00
parent 35131f4295
commit f962ab3ef0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.html
View File

@ -47,10 +47,10 @@
<iqser-icon-button
(action)="delete()"
*ngIf="user"
*ngIf="user && user.id !== userService.currentUser.id"
[label]="'add-edit-user.actions.delete' | translate"
icon="iqser:trash"
[type]="iconButtonTypes.dark"
icon="iqser:trash"
></iqser-icon-button>
<div class="all-caps-label cancel" mat-dialog-close translate="add-edit-user.actions.cancel"></div>

8
apps/red-ui/src/app/modules/admin/dialogs/add-edit-user-dialog/user-details/user-details.component.ts
View File

@ -29,7 +29,7 @@ export class UserDetailsComponent implements OnInit {
private readonly _toaster: Toaster,
private readonly _dialogService: AdminDialogService,
private readonly _loadingService: LoadingService,
private readonly _userService: UserService,
readonly userService: UserService,
) {}
get changed(): boolean {
@ -69,7 +69,7 @@ export class UserDetailsComponent implements OnInit {
return false;
}
const isCurrentAdminUser = this.user.isAdmin && this.user.id === this._userService.currentUser.id;
const isCurrentAdminUser = this.user.isAdmin && this.user.id === this.userService.currentUser.id;
return (
(role === 'RED_ADMIN' && isCurrentAdminUser) ||
Object.keys(this._ROLE_REQUIREMENTS).reduce(
@ -112,7 +112,7 @@ export class UserDetailsComponent implements OnInit {
const userData = { ...this.userForm.getRawValue(), roles: this.activeRoles };
if (!this.user) {
await this._userService
await this.userService
.create(userData)
.toPromise()
.then(() => {
@ -127,7 +127,7 @@ export class UserDetailsComponent implements OnInit {
this._loadingService.stop();
});
} else {
await this._userService.updateProfile(userData, this.user.id).toPromise();
await this.userService.updateProfile(userData, this.user.id).toPromise();
this.closeDialog.emit(true);
}
}

2
apps/red-ui/src/assets/i18n/de.json
View File

@ -1146,7 +1146,7 @@
"redaction": "Redaktion",
"remove-annotations-dialog": {
"confirm": "Ja, fortfahren und entfernen!",
"deny": "Stornieren",
"cancel": "Stornieren",
"dictionary": "Wörterbuch",
"image-type": "",
"remove-from-dictionary": {

4
apps/red-ui/src/assets/i18n/en.json
View File

@ -1264,12 +1264,12 @@
"assign-approver": "You have been assigned as approver for <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"assign-reviewer": "You have been assigned as reviewer for <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"document-approved": " <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> has been approved!",
"dossier-deleted": "Dossier: <b{dossierName}</b> has been deleted!",
"dossier-owner-deleted": "<b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner removed!",
"dossier-owner-removed": "<b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner removed!",
"dossier-owner-set": " <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> owner changed to <b>{user}</b>!",
"unassigned-from-file": "You have been unassigned from <b><a href=\"{fileHref}\" target=\"_blank\">{fileName}</a></b> in the <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a><b>!",
"user-becomes-dossier-member": "<b>{user}</b> joined dossier: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b>!",
"dossier-deleted": "Dossier: <b{dossierName}</b> has been deleted!",
"user-demoted-to-reviewer": "<b>{user}</b> demoted to reviewer in dossier: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b>!",
"user-promoted-to-approver": "<b>{user}</b> promoted to approver in dossier: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b>!",
"user-removed-as-dossier-member": "<b>{user}</b> removed as a member of: <b><a href=\"{dossierHref}\" target=\"_blank\">{dossierName}</a></b> !"
@ -1316,8 +1316,8 @@
},
"redaction": "Redaction",
"remove-annotations-dialog": {
"confirm": "Yes, proceed and remove!",
"cancel": "Cancel",
"confirm": "Yes, proceed and remove!",
"dictionary": "Dictionary",
"image-type": "Image: {typeLabel}",
"remove-from-dictionary": {