Merge pull request #158 from bartvde/error-msg

Show error dialog when WPS execution fails
MapStory · Feb 9, 2015 · d53ed47 · d53ed47
2 parents 427d1c4 + ba186b2
commit d53ed47
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 4 deletions.
diff --git a/lib/ng/edit/style/services/layerClassificationService.js b/lib/ng/edit/style/services/layerClassificationService.js
@@ -3,7 +3,7 @@
 
     var module = angular.module('storytools.edit.style.layerClassificationService', []);
 
-    module.factory('stLayerClassificationService', function($q, $http) {
+    module.factory('stLayerClassificationService', function($q, $http, $modal, $sce, $log) {
         return {
             classify: function(layer, attribute, method, numClasses) {
                 if (!this.cache) {
@@ -81,9 +81,16 @@
                                 service.cache[key] = response.rules;
                                 return response.rules;
                             } else {
-                                if (window.console) {
-                                    window.console.warn(response.msg);
-                                }
+                                $modal.open({
+                                    templateUrl: '/lib/templates/core/error-dialog.html',
+                                    controller: function($scope) {
+                                        $scope.title = 'Error';
+                                        $scope.msg = $sce.trustAsHtml(
+                                            'An error occurred when communicating with the classification ' + 
+                                            'service: <br/>' + response.msg);
+                                    }
+                                });
+                                $log.warn(response.msg);
                                 return [];
                             }
                         });

diff --git a/lib/templates/core/error-dialog.html b/lib/templates/core/error-dialog.html
@@ -0,0 +1,11 @@
+<div>
+    <div class="modal-header">
+        <h3 class="modal-title">{{title}}</h3>
+    </div>
+    <div class="modal-body">
+       <span ng-bind-html="msg"></span>
+    </div>
+    <div class="modal-footer">
+        <button class="btn btn-primary" ng-click="$close()">OK</button>
+    </div>
+</div>