diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html index 508eac389..9c3d18d86 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/attributes/edit-dossier-attributes.component.html @@ -17,6 +17,7 @@ [id]="attr.id" [label]="attr.label" [type]="attr.type" + [canEditInput]="!disabled" > diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html index e9e68b36f..f11b0df05 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/download-package/edit-dossier-download-package.component.html @@ -1,16 +1,18 @@
diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts index f1dc89ce3..5049f12e9 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-dialog.component.ts @@ -164,13 +164,14 @@ export class EditDossierDialogComponent extends BaseDialogComponent implements A key: 'dossierInfo', title: _('edit-dossier-dialog.nav-items.general-info'), sideNavTitle: _('edit-dossier-dialog.nav-items.dossier-info'), - readonly: !this._dossier.isActive, + readonly: !this._dossier.isActive || !this._permissionsService.canEditDossier(this._dossier), helpModeKey: 'edit_dossier_dossier_info', }, { key: 'downloadPackage', title: _('edit-dossier-dialog.nav-items.choose-download'), sideNavTitle: _('edit-dossier-dialog.nav-items.download-package'), + readonly: !this._permissionsService.canEditDossier(this._dossier), helpModeKey: 'edit_dossier_download_package', }, { diff --git a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html index 2ed9ecb93..b3658280c 100644 --- a/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html +++ b/apps/red-ui/src/app/modules/shared-dossiers/dialogs/edit-dossier-dialog/edit-dossier-team/edit-dossier-team.component.html @@ -41,7 +41,7 @@
{{ 'assign-dossier-owner.dialog.no-reviewers' | translate }}
- + { dossier, this._systemPreferencesService.values.softDeleteCleanupTime, this._permissionsService.canRestoreDossier(dossier), - this._permissionsService.canHardDeleteDossier(dossier), + this._permissionsService.canDeleteDossier(dossier), this._userService.getName(dossier.ownerId), ), ), diff --git a/apps/red-ui/src/app/services/permissions.service.ts b/apps/red-ui/src/app/services/permissions.service.ts index d3de4966c..2f915f76f 100644 --- a/apps/red-ui/src/app/services/permissions.service.ts +++ b/apps/red-ui/src/app/services/permissions.service.ts @@ -266,14 +266,7 @@ export class PermissionsService { return this.isApprover(dossier) && files.reduce((prev, file) => prev && !file.isInitialProcessing, true); } - canSoftDeleteDossier(dossier: IDossier): boolean { - return ( - this._iqserPermissionsService.has(ROLES.dossiers.delete) && - (this.isOwner(dossier) || (this.isManager() && this.isDossierMember(dossier))) - ); - } - - canHardDeleteDossier(dossier: IDossier): boolean { + canDeleteDossier(dossier: IDossier): boolean { return this._iqserPermissionsService.has(ROLES.dossiers.delete) && this.isOwner(dossier); } diff --git a/libs/common-ui b/libs/common-ui index 9eecf327c..4c9db877c 160000 --- a/libs/common-ui +++ b/libs/common-ui @@ -1 +1 @@ -Subproject commit 9eecf327c264ae65dc80dc474d5e02526d63597e +Subproject commit 4c9db877cd810f3c9191dd28961f4637bf153f92