Commit 23287a48 authored by Alexander Philipp Nowosad's avatar Alexander Philipp Nowosad
Browse files

Fix merge model view navigation

parent 3ccc53b2
......@@ -98,11 +98,9 @@
</div>
<div class="modal-body">
<div class="alert alert-warning" role="alert">
<p>
This will add all subfeatures of
{{ modalFeature ? modalFeature.name : 'the model' }} to the composed
model as new features if they are not merged yet.
</p>
This will add all subfeatures of
{{ modalFeature ? modalFeature.name : 'the model' }} to the composed model
as new features if they are not merged yet.
</div>
</div>
......@@ -199,19 +197,20 @@
<div class="nav-scroller bg-white shadow-sm">
<nav class="nav nav-underline">
<a class="nav-link" [routerLink]="['/', 'companyModels']">
Composed Models
</a>
<a
*ngIf="companyModel"
class="nav-link"
[routerLink]="['/companyModels', companyModel._id]"
>View {{ companyModel.name }}</a
[routerLink]="['/', 'companyModels', companyModel._id]"
>
{{ companyModel.name }}
</a>
<a
*ngIf="companyModel"
class="nav-link"
[routerLink]="['/companyModels', companyModel._id, 'edit']"
>Edit {{ companyModel.name }}</a
>
<a *ngIf="expertModel" class="nav-link active" [routerLink]="[]"
*ngIf="companyModel && expertModel"
class="nav-link active"
[routerLink]="[]"
>Merge {{ expertModel.name }}</a
>
</nav>
......@@ -220,7 +219,7 @@
<main *ngIf="expertModel && companyModel" role="main">
<!-- List of Features -->
<div class="my-3 p-3 bg-white rounded shadow-sm">
<h6 class="border-bottom border-gray pb-2">Merge Model List</h6>
<h6 class="border-bottom border-gray pb-2">Merge Feature Tree</h6>
<div class="alert alert-info container" role="alert">
<p>
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment