description template has conflict bug fix
This commit is contained in:
parent
aaac7dfdf4
commit
3ec12fdf59
|
@ -202,15 +202,14 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
|
||||||
|
|
||||||
if (id === null) {
|
if (id === null) {
|
||||||
route.push('../..');
|
route.push('../..');
|
||||||
} else if (this.isNew) {
|
this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
|
||||||
route.push('../' + id);
|
} else if (this.isNew || this.isNewVersion || this.isClone) {
|
||||||
} else if (this.isNewVersion || this.isClone) {
|
route.push('/description-templates/' + id);
|
||||||
route.push('/description-templates');
|
this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
|
||||||
} else {
|
} else{
|
||||||
route.push('..');
|
this.refreshData();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
persistEntity(onSuccess?: (response) => void): void {
|
persistEntity(onSuccess?: (response) => void): void {
|
||||||
|
|
Loading…
Reference in New Issue