From 016dbc06e8c50664d957b376dd01512a83b4016f Mon Sep 17 00:00:00 2001 From: Florent Poittevin <florent.poittevin@unige.ch> Date: Mon, 20 Jan 2020 16:10:53 +0100 Subject: [PATCH] feat: when submit, approve, reject, stay on the current deposit --- .../deposit-detail-edit/deposit-detail-edit.routable.ts | 2 +- src/app/features/deposit/stores/deposit.state.ts | 6 +++--- src/assets/i18n/fr.json | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts index 62f586e3c..09e9921b5 100644 --- a/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts +++ b/src/app/features/deposit/components/routables/deposit-detail-edit/deposit-detail-edit.routable.ts @@ -170,7 +170,7 @@ export class DepositDetailEditRoutable extends SharedAbstractDetailEditRoutable< this.subscribe(this.currentObs.pipe( distinctUntilChanged(), filter(deposit => !isNullOrUndefined(deposit) && deposit.resId === this._resId), - take(1), + // take(1), tap(deposit => { const canDoValidatorActions = this._securityService.depositInValidationStep(deposit); const canDoAlterationActions = this._securityService.depositInEditionStep(deposit); diff --git a/src/app/features/deposit/stores/deposit.state.ts b/src/app/features/deposit/stores/deposit.state.ts index 39ec14742..1d98674dd 100644 --- a/src/app/features/deposit/stores/deposit.state.ts +++ b/src/app/features/deposit/stores/deposit.state.ts @@ -679,8 +679,8 @@ export class DepositState extends ResourceState<DepositStateModel, DepositExtend private redirectToDepositDetail(ctx: StateContext<DepositStateModel>, depositId: string): void { // ctx.dispatch(new DepositAction.Clean()); - // ctx.dispatch(new Navigate([RoutesEnum.deposit, ctx.getState().organizationalUnit.resId, DepositRoutesEnum.detail, depositId])); - ctx.dispatch(new Navigate([RoutesEnum.deposit])); - // ctx.dispatch(new DepositAction.GetById(depositId)); + ctx.dispatch(new Navigate([RoutesEnum.deposit, ctx.getState().organizationalUnit.resId, DepositRoutesEnum.detail, depositId])); + // ctx.dispatch(new Navigate([RoutesEnum.deposit])); + ctx.dispatch(new DepositAction.GetById(depositId)); } } diff --git a/src/assets/i18n/fr.json b/src/assets/i18n/fr.json index af745be1f..01f10fa64 100644 --- a/src/assets/i18n/fr.json +++ b/src/assets/i18n/fr.json @@ -956,7 +956,7 @@ "antivirus": "Antivirus", "checksum": "Checksum", "complianceLevel": "Niveau de conformité", - "fileInfo": "Informations sut le fichier" + "fileInfo": "Informations sur le fichier" }, "title": "Détails du fichier \"{{name}}\"" }, -- GitLab