Merge pull request #172 from Gid733/master

renemadsen · web-flow · commit c48d28bbd117 · 2018-11-21T11:19:10.000+01:00
Changed confirmation case routing
diff --git a/eform-client/src/app/modules/cases/components/case-edit/case-edit.component.ts b/eform-client/src/app/modules/cases/components/case-edit/case-edit.component.ts
@@ -116,15 +116,12 @@ export class CaseEditComponent implements OnInit, OnDestroy {
   }
 
   navigateToReverse() {
-    if (!this.reverseRoute) {
-      this.router.navigate(['/cases/', this.currentTemplate.id]).then();
-    } else {
+    if (this.reverseRoute) {
       this.router.navigate([this.reverseRoute]);
     }
   }
 
   canDeactivate(): Observable<boolean> | boolean {
-    debugger;
     if (!this.isNoSaveExitAllowed) {
       this.caseConfirmation.show();
       return this.caseConfirmation.navigateAwaySelection$;

Original file line number	Diff line number	Diff line change
`@@ -116,15 +116,12 @@ export class CaseEditComponent implements OnInit, OnDestroy {`
`116`	`116`	`}`
`117`	`117`
`118`	`118`	`navigateToReverse() {`
`119`		`- if (!this.reverseRoute) {`
`120`		`- this.router.navigate(['/cases/', this.currentTemplate.id]).then();`
`121`		`- } else {`
	`119`	`+ if (this.reverseRoute) {`
`122`	`120`	`this.router.navigate([this.reverseRoute]);`
`123`	`121`	`}`
`124`	`122`	`}`
`125`	`123`
`126`	`124`	`canDeactivate(): Observable<boolean> \| boolean {`
`127`		`- debugger;`
`128`	`125`	`if (!this.isNoSaveExitAllowed) {`
`129`	`126`	`this.caseConfirmation.show();`
`130`	`127`	`return this.caseConfirmation.navigateAwaySelection$;`