diff --git a/src/frontend/app/actions/actions.service.ts b/src/frontend/app/actions/actions.service.ts index 69a9ce9f9ac06fb6b70b1651070b486c6a216211..64af0696bedeb669e05a880299009b1c25ac5c8c 100644 --- a/src/frontend/app/actions/actions.service.ts +++ b/src/frontend/app/actions/actions.service.ts @@ -121,10 +121,6 @@ export class ActionsService { if (this.setActionInformations(action, userId, groupId, null, null)) { this.setResourceInformations(datas); - if (datas['followed']) { - this.headerService.nbResourcesFollowed++; - } - this.loading = true; try { this[action.component](); @@ -246,6 +242,10 @@ export class ActionsService { } endAction(resIds: any) { + if (!this.functions.empty(this.currentResourceInformations['followed']) && this.currentResourceInformations['followed']) { + this.headerService.nbResourcesFollowed++; + } + this.notify.success(this.lang.action + ' : "' + this.currentAction.label + '" ' + this.lang.done); this.eventAction.next(resIds); diff --git a/src/frontend/app/actions/close-mail-action/close-mail-action.component.ts b/src/frontend/app/actions/close-mail-action/close-mail-action.component.ts index 1720fc802a11551dcad19848ab596f667b3bc079..58847f7757b5d019d7a957d7dc7f035dcda4462e 100644 --- a/src/frontend/app/actions/close-mail-action/close-mail-action.component.ts +++ b/src/frontend/app/actions/close-mail-action/close-mail-action.component.ts @@ -44,7 +44,7 @@ export class CloseMailActionComponent implements OnInit { checkIndexingClose() { this.http.get(`../../rest/actions/${this.data.action.id}`).pipe( tap((data: any) => { - this.requiredFields = data.action.parameters; + this.requiredFields = data.action.parameters.requiredFields; }), exhaustMap(() => this.http.get(`../../rest/customFields`)), tap((data: any) => this.customFields = data.customFields),