Compare commits

...

3 Commits

Author SHA1 Message Date
Dan Percic
7345991f03 show dossier dictionaries even if dossier redaction is not available 2024-02-16 10:29:50 +02:00
Valentin Mihai
cff765f478 RED-7980 - Not all unprocessed annotations are displayed correctly 2024-02-15 16:31:41 +02:00
Nicoleta Panaghiu
26186e6bf7 RED-6880: fixed infinite loading. 2024-02-15 14:40:34 +02:00
3 changed files with 13 additions and 9 deletions

View File

@ -25,9 +25,10 @@ export class AnnotationCardComponent {
((this.annotation.isModifyDictionary &&
!this.annotation.isRemovedLocally &&
!this.annotation.hasBeenForcedHint &&
(this.annotation.lastManualChange !== ManualRedactionTypes.LEGAL_BASIS_CHANGE &&
this.annotation.lastManualChange !== ManualRedactionTypes.RESIZE_LOCALLY)) ||
this.annotation.type === ImageCategory.SIGNATURE)
this.annotation.lastManualChange !== ManualRedactionTypes.LEGAL_BASIS_CHANGE &&
this.annotation.lastManualChange !== ManualRedactionTypes.RESIZE_LOCALLY) ||
this.annotation.type === ImageCategory.SIGNATURE ||
this.annotation.IMAGE_HINT)
);
}
}

View File

@ -307,10 +307,7 @@ export class PermissionsService {
canEditDossierDictionary(dossier: Dossier): boolean {
return (
dossier.isActive &&
this._dossierDictionariesMapService.get(dossier.id).length > 0 &&
this.isDossierMember(dossier) &&
this._iqserPermissionsService.has(Roles.dossiers.dictionaryEntries.write)
dossier.isActive && this.isDossierMember(dossier) && this._iqserPermissionsService.has(Roles.dossiers.dictionaryEntries.write)
);
}

View File

@ -23,8 +23,14 @@ export class RedRoleGuard extends IqserRoleGuard {
return false;
}
// we have at least 1 RED Role -> if it's not user he must be an admin
if (currentUser.isUserAdmin && !currentUser.isAdmin && state.url.includes('admin') && !state.url.includes('users')) {
// we have at least 1 RED Role -> if it's not user he must be an admin or a manager
if (
currentUser.isUserAdmin &&
!currentUser.isManager &&
!currentUser.isAdmin &&
state.url.includes('admin') &&
!state.url.includes('users')
) {
this._logger.warn('[GUARD] Redirect to users page');
await this._router.navigate(['/main/admin/users']);
return false;