Skip to content
Snippets Groups Projects
Commit a0b35804 authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

fix: 1456 display always see object for notification info

parent 8f857e9a
No related branches found
No related tags found
No related merge requests found
...@@ -91,7 +91,7 @@ export class PreservationSpaceNotificationDetailEditRoutable extends SharedAbstr ...@@ -91,7 +91,7 @@ export class PreservationSpaceNotificationDetailEditRoutable extends SharedAbstr
{ {
color: "primary", color: "primary",
icon: IconNameEnum.navigate, icon: IconNameEnum.navigate,
displayCondition: current => !isNullOrUndefined(current) && this.mode === NotificationModeEnum.inbox && current.notificationStatus !== NotificationStatusEnum.PROCESSED, displayCondition: current => !isNullOrUndefined(current) && this.mode === NotificationModeEnum.inbox && (current.notificationType.notificationCategory === NotificationCategoryEnum.INFO || current.notificationStatus !== NotificationStatusEnum.PROCESSED),
callback: (current) => NotificationHelper.process(current, this._store, this._notificationService), callback: (current) => NotificationHelper.process(current, this._store, this._notificationService),
labelToTranslate: (current) => isNotNullOrUndefined(current) && current.notificationType.notificationCategory === NotificationCategoryEnum.REQUEST ? MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.process") : MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.seeObject"), labelToTranslate: (current) => isNotNullOrUndefined(current) && current.notificationType.notificationCategory === NotificationCategoryEnum.REQUEST ? MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.process") : MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.seeObject"),
order: 40, order: 40,
......
...@@ -157,7 +157,7 @@ export class PreservationSpaceNotificationListRoutable extends SharedAbstractLis ...@@ -157,7 +157,7 @@ export class PreservationSpaceNotificationListRoutable extends SharedAbstractLis
logo: IconNameEnum.navigate, logo: IconNameEnum.navigate,
callback: model => NotificationHelper.process(model, this._store, this._notificationService), callback: model => NotificationHelper.process(model, this._store, this._notificationService),
placeholder: current => isNotNullOrUndefined(current) && current.notificationType.notificationCategory === NotificationCategoryEnum.REQUEST ? MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.process") : MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.seeObject"), placeholder: current => isNotNullOrUndefined(current) && current.notificationType.notificationCategory === NotificationCategoryEnum.REQUEST ? MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.process") : MARK_AS_TRANSLATABLE("preservationSpace.notifications.navigation.button.seeObject"),
displayOnCondition: model => (this._securityService.isRootOrAdmin() || this._securityService.isManagerOfOrgUnit(model.resId)) && model.notificationStatus !== NotificationStatusEnum.PROCESSED, displayOnCondition: model => (this._securityService.isRootOrAdmin() || this._securityService.isManagerOfOrgUnit(model.resId)) && (model.notificationType.notificationCategory === NotificationCategoryEnum.INFO || model.notificationStatus !== NotificationStatusEnum.PROCESSED),
}, },
{ {
logo: IconNameEnum.approve, logo: IconNameEnum.approve,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment