diff options
| author | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-20 04:01:38 +0200 |
|---|---|---|
| committer | Danijel Anđelković <adanijel99@gmail.com> | 2022-05-20 04:01:38 +0200 |
| commit | 9930bdb624f9511e9f4ead7abd435d25fbdcac4a (patch) | |
| tree | a1f2071655b4bd2d78f46c7bb0424a08985664b8 /frontend/src/app/_elements/folder | |
| parent | 447dbf0fe8cdb02bf5e8fb41540eac79329b3013 (diff) | |
| parent | b18a4134048bac5df33d100cd09087566a6e5a8d (diff) | |
Merge branch 'redesign' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into redesign
Diffstat (limited to 'frontend/src/app/_elements/folder')
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.css | 1 | ||||
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.html | 7 | ||||
| -rw-r--r-- | frontend/src/app/_elements/folder/folder.component.ts | 1 |
3 files changed, 6 insertions, 3 deletions
diff --git a/frontend/src/app/_elements/folder/folder.component.css b/frontend/src/app/_elements/folder/folder.component.css index 97c13299..682fc645 100644 --- a/frontend/src/app/_elements/folder/folder.component.css +++ b/frontend/src/app/_elements/folder/folder.component.css @@ -1,5 +1,6 @@ #folder { width: 100%; + } #tabs { diff --git a/frontend/src/app/_elements/folder/folder.component.html b/frontend/src/app/_elements/folder/folder.component.html index 7c42b1db..a557edde 100644 --- a/frontend/src/app/_elements/folder/folder.component.html +++ b/frontend/src/app/_elements/folder/folder.component.html @@ -116,9 +116,10 @@ </div> </div> - <div class="list-add" [ngSwitch]="type"> - <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj {{privacy == Privacy.Public ? 'javni ' : ' '}}izvor podataka</button> - <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj {{privacy == Privacy.Public ? 'javnu ' : ' '}}konfiguraciju neuronske mreže</button> + <div class="list-add" [ngSwitch]="type" *ngIf="privacy != Privacy.Public" > + <!-- {{privacy == Privacy.Public ? 'javni ' : ' '}} --> + <button mat-raised-button *ngSwitchCase="FolderType.Dataset" (click)="selectNewFile()">Dodaj izvor podataka</button> + <button mat-raised-button *ngSwitchCase="FolderType.Model" (click)="selectNewFile()">Dodaj konfiguraciju neuronske mreže</button> <button mat-raised-button *ngSwitchCase="FolderType.Experiment" routerLink="/experiment">Dodaj eksperiment</button> </div> </div> diff --git a/frontend/src/app/_elements/folder/folder.component.ts b/frontend/src/app/_elements/folder/folder.component.ts index ed38bbd6..93e8ba98 100644 --- a/frontend/src/app/_elements/folder/folder.component.ts +++ b/frontend/src/app/_elements/folder/folder.component.ts @@ -467,6 +467,7 @@ export class FolderComponent implements AfterViewInit { setTimeout(() => { if (tab == TabType.NewFile) { this.selectNewFile(); + this.selectedFile=undefined!; } this.listView = this.getListView(tab); |