sxhundred/ISA-Frontend
1
0
Fork 0
mirror of https://dev.azure.com/hugendubel/ISA/_git/ISA-Frontend synced 2025-12-31 09:37:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into testing

Browse Source
This commit is contained in:
Eraldo Hasanaj
2019-02-12 15:19:34 +01:00
parent 84449b2e95 5f5190c879
commit b623b06321
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/core/store/state/process.state.ts
View File

@@ -578,7 +578,7 @@ export class ProcessState {
...state,
processes: state.processes.map(process => {
if (process.selected === true) {
return { ...process, breadcrumbs: [...process.breadcrumbs, payload] };
return { ...this.updateBreadcrumbForCurrentProcess(process, payload.name, payload.path) };
}
return { ...process };
})
@@ -611,7 +611,7 @@ export class ProcessState {
}
const updatedBreadcrumbs = process.breadcrumbs.map(
(breadcrumb: Breadcrumb) => {
if (breadcrumb.path === path) {
if (breadcrumb.path === path || breadcrumb.path.substring(0, 16) === path.substring(0, 16)) {
return { name: payload, path: path };
}
return breadcrumb;

6
src/app/modules/process/process-delete-dialog/process-delete-dialog.component.ts
View File

@@ -1,6 +1,7 @@
import { Component, OnInit, EventEmitter, Output, Input } from '@angular/core';
import { ModalService } from 'src/app/core/services/modal.service';
import { Process } from 'src/app/core/models/process.model';
import { Router } from '@angular/router';
@Component({
selector: 'app-process-delete-dialog',
@@ -19,7 +20,9 @@ export class ProcessDeleteDialogComponent implements OnInit {
return this._process;
}
constructor(private modalService: ModalService) { }
constructor(
private modalService: ModalService,
private router: Router) { }
ngOnInit() {
}
@@ -35,6 +38,7 @@ export class ProcessDeleteDialogComponent implements OnInit {
delete() {
this.deleted.emit(this.process);
this.modalService.close(this.id);
this.router.navigate(['/dashboard']);
}
}