Fix Modal closing bug

Author: jj

src/main/webapp/js/workbench/extraction-and-loading/d2rq-mapping-controller.js

@@ -133,11 +133,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshMappingGroups().then(function(response) {
-                    close('#modalMappingGroup');
+                    $scope.close('#modalMappingGroup');
                     adding = false;
                 });
             }, function(response) {
-                close('#modalMappingGroup');
+                $scope.close('#modalMappingGroup');
                 flash.error = ServerErrorResponse.getMessage(response.status);
             });
         });
@@ -694,11 +694,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                     headers: {"Content-Type":"application/json; charset=utf-8"}
                 }).then(function(response) {
                     $scope.refreshMappingGroups().then(function(response) {
-                        close('#modalMapping');
+                        $scope.close('#modalMapping');
                         adding = false;
                     });
                 }, function(response) {
-                    close('#modalMapping');
+                    $scope.close('#modalMapping');
                     flash.error = ServerErrorResponse.getMessage(response.status);
                 });
             });
@@ -711,11 +711,11 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshMappingGroups().then(function(response) {
-                    close('#modalMapping');
+                    $scope.close('#modalMapping');
                     adding = false;
                 });
             }, function(response) {
-                close('#modalMapping');
+                $scope.close('#modalMapping');
                 flash.error = ServerErrorResponse.getMessage(response.status);
             });
         }
@@ -738,4 +738,12 @@ var D2RQMappingCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Ac
     $scope.localize = function(str) {
         return localize.getLocalizedString(str);
     };
+    
+    $scope.close = function(modalID) {
+    	$(modalID).modal('hide');
+        $('body').removeClass('modal-open');
+      	$('.modal-backdrop').slideUp();
+      	$('.modal-scrollable').slideUp();
+    };
+    
 };

src/main/webapp/js/workbench/extraction-and-loading/d2rq-task-controller.js

@@ -65,16 +65,20 @@ var D2RQTaskCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Accou
     };
 
     var findDataset = function(ontology, endpoint, graph) {
+    	console.log($scope.datasets);
         for (var ind in $scope.datasets) {
             var ds = $scope.datasets[ind];
             if (ds.graph==graph && ds.httpEndpoint==endpoint && ds.ontology==ontology)
+            	console.log(ds);
                 return ds;
         }
         return null;
     };
 
     var findOrCreateDataset = function(ontology, endpoint, graph) {
+    	console.log(ontology + " " + endpoint + " " + graph);
         var ds = findDataset(ontology, endpoint, graph);
+        console.log(ds);
         if (ds!=null) {
             var deferred = $q.defer();
             deferred.resolve(ds);
@@ -105,12 +109,12 @@ var D2RQTaskCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Accou
                     headers: {"Content-Type":"application/json; charset=utf-8"}
                 }).then(function(response) {
                     $scope.refreshTasks().then(function(response) {
-                        close('#modalTask');
+                        $scope.close('#modalTask');
                         adding = false;
                     });
                 }, function(response) {
                     flash.error = ServerErrorResponse.getMessage(response.status);
-                    close('#modalTask');
+                    $scope.close('#modalTask');
                 });
             });
     };
@@ -147,4 +151,12 @@ var D2RQTaskCtrl = function($scope, $http, $q, flash, ServerErrorResponse, Accou
             $scope.refreshTasks();
         });
     };
+    
+    $scope.close = function(modalID) {
+    	$(modalID).modal('hide');
+        $('body').removeClass('modal-open');
+      	$('.modal-backdrop').slideUp();
+      	$('.modal-scrollable').slideUp();
+    };
+    
 };

src/main/webapp/js/workbench/manual-revision-and-authoring/ontology-controller.js

@@ -57,7 +57,7 @@ var OntologyCtrl = function($scope, $http, flash, ServerErrorResponse, AccountSe
                 headers: {"Content-Type":"application/json; charset=utf-8"}
             }).then(function(response) {
                 $scope.refreshOntologies();
-                close('#modalOntology');
+                $scope.close('#modalOntology');
             }, function(response) {
                 flash.error = ServerErrorResponse.getMessage(response.status);
                 $scope.refreshOntologies();
@@ -69,7 +69,7 @@ var OntologyCtrl = function($scope, $http, flash, ServerErrorResponse, AccountSe
                 data: {user: AccountService.getUsername()} //todo unauthorized user
             }).then(function(response) {
                 $scope.refreshOntologies();
-                close('#modalOntology');
+                $scope.close('#modalOntology');
             }, function(response) {
                 flash.error = ServerErrorResponse.getMessage(response.status);
                 $scope.refreshOntologies();
@@ -119,4 +119,12 @@ var OntologyCtrl = function($scope, $http, flash, ServerErrorResponse, AccountSe
     $scope.isLoggedIn = function() {
         return AccountService.isLogged();
     };
+    
+    $scope.close = function(modalID) {
+    	$(modalID).modal('hide');
+        $('body').removeClass('modal-open');
+      	$('.modal-backdrop').slideUp();
+      	$('.modal-scrollable').slideUp();
+    };
+    
 };