Merge branch 'dev' of http://gitlab.pmf.kg.ac.rs/igrannonica/neuronstellar into dev

# Conflicts:
#	frontend/src/app/app.module.ts

1 files changed, 3 insertions, 2 deletions

diff --git a/frontend/src/app/_pages/my-models/my-models.component.ts b/frontend/src/app/_pages/my-models/my-models.component.ts
index 6086b1b1..f3877e2d 100644
--- a/frontend/src/app/_pages/my-models/my-models.component.ts
+++ b/frontend/src/app/_pages/my-models/my-models.component.ts
@@ -32,7 +32,7 @@ export class MyModelsComponent implements OnInit {
 */
 
 deleteThisModel(model: Model): void{
-  console.log("OK");
+  shared.openYesNoDialog('Brisanje seta podataka','Da li ste sigurni da želite da obrišete model?',() => {
   this.modelsS.deleteModel(model).subscribe((response) => {
     console.log("OBRISANOOO JEE", response);
     //na kraju uspesnog
@@ -42,9 +42,10 @@ deleteThisModel(model: Model): void{
         shared.openDialog("Obaveštenje", "Greška prilikom brisanja modela.");
       }
     });
-
+  });
 }
 
+
   getAllMyModels(): void{
     this.modelsS.getMyModels().subscribe(m => {