diff options
author | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-31 13:54:06 +0200 |
---|---|---|
committer | Danijel Andjelkovic <adanijel99@gmail.com> | 2022-03-31 13:54:06 +0200 |
commit | 8779b55a3a3637dbfb1bea518ebdc4d340687097 (patch) | |
tree | b0f8b749f0769649bbaf32714920ca5d9c0fd0a9 /frontend/src/app/_pages/add-model/add-model.component.html | |
parent | b573b0069512f4444aefdac0a24eb99c8fcb6586 (diff) | |
parent | e5d06f541553597d5db1b0e8a552935679875132 (diff) |
Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev
# Conflicts:
# frontend/src/app/_pages/add-model/add-model.component.html
# frontend/src/app/_pages/add-model/add-model.component.ts
Diffstat (limited to 'frontend/src/app/_pages/add-model/add-model.component.html')
-rw-r--r-- | frontend/src/app/_pages/add-model/add-model.component.html | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/frontend/src/app/_pages/add-model/add-model.component.html b/frontend/src/app/_pages/add-model/add-model.component.html index 67427e8d..62468b2d 100644 --- a/frontend/src/app/_pages/add-model/add-model.component.html +++ b/frontend/src/app/_pages/add-model/add-model.component.html @@ -50,7 +50,7 @@ <li class="list-group-item p-3" *ngFor="let dataset of myDatasets|filter:term" [ngClass]="{'selectedDatasetClass': this.selectedDataset == dataset}"> <app-item-dataset name="usersDataset" [dataset]="dataset" - (click)="scrollToNextForm(); selectThisDataset(dataset);"></app-item-dataset> + (click)="selectThisDataset(dataset);"></app-item-dataset> </li> </ul> </div> @@ -66,7 +66,8 @@ <!-- ULAZNE/IZLAZNE KOLONE --> <span id="selectInAndOuts"></span> - <div *ngIf="selectedDataset && (showMyDatasets || (!showMyDatasets && datasetLoaded))"> + <div + *ngIf="selectedDataset && ((showMyDatasets && selectedDatasetLoaded) || (!showMyDatasets && datasetLoaded))"> <!--postignuto da se kod newdataseta ucita tabela pa ulazi/izlazi. ostalo srediti to kod mydatasets(dopuna 2. uslova)--> <div class="row"> <div class="col d-flex justify-content-center"> |