sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-28 22:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merged PR 1204: #3063 Remission unnötiger Return Aufruf bei Wechsel zu gestarteter Remi über...

Browse Source 
#3063 Remission unnötiger Return Aufruf bei Wechsel zu gestarteter Remi über den Footer

Related work items: #3063
This commit is contained in:
Andreas Schickinger
2022-04-28 11:55:44 +00:00
committed by Nino Righi
parent 833542f303
commit a73acfa4e8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/isa-app/src/app/guards/can-activate-remission.guard.ts
View File

@@ -25,6 +25,12 @@ export class CanActivateRemissionGuard implements CanActivate {
}
this._applicationService.activateProcess(this._config.get('process.ids.remission'));
return true;
if (!!process?.data?.active && !state.url.includes(`/filiale/remission/${process?.data?.active}`)) {
await this._router.navigate(['/filiale', 'remission', process?.data?.active, 'list']);
return false;
} else {
return true;
}
}
}

2
apps/page/remission/src/lib/remission.component.ts
View File

@@ -69,8 +69,6 @@ export class RemissionComponent implements OnInit, OnDestroy {
data: { active: +params.returnId },
});
}
} else if (!!process?.data?.active) {
await this._router.navigate(['./', process?.data?.active, 'list'], { relativeTo: this._activatedRoute });
} else {
this._applicationService.patchProcess(this.processId, {
closeable: true,