error dialog on error on dialog ok cancel

src/modals/dialogerror.html

@@ -5,8 +5,8 @@
         <div class="clearfix"></div>
     </div>
     <div class="modal-footer">
-        <button type="submit" class="btn btn-pink" ng-click="$dismiss()" ng-show="!showLogin">Close</button>
-        <button type="submit" class="btn btn-default" ng-click="$dismiss()" ng-show="showLogin">Cancel</button>
-        <button type="button" class="btn btn-pink" ng-click="reconnect()" ng-show="showLogin">Login</button>
+        <button type="submit" class="btn btn-default" ng-click="$close()" ng-show="!showLogin">Close</button>
+        <button type="submit" class="btn btn-default" ng-click="$close()" ng-show="showLogin">Cancel</button>
+        <button type="button" class="btn btn-default" ng-click="reconnect()" ng-show="showLogin">Login</button>
     </div>
 </div>

src/modals/dialogerrorhelper.js

@@ -23,7 +23,7 @@
             luticateDialogErrorHelper.errorDialog = function(data)
             {
                 var message = luticateDialogErrorHelper.errorMessage(data);
-                dialogs.create('/luticateUtils/dialogerror.html', 'luticateDialogError', {message: message, data: data}, {keyboard: false, backdrop: 'static'});
+                return dialogs.create('/luticateUtils/dialogerror.html', 'luticateDialogError', {message: message, data: data}, {keyboard: false, backdrop: 'static'});
             };
 
             return luticateDialogErrorHelper;
@@ -39,8 +39,8 @@ angular.module("luticateUtils").run(["$templateCache", function($templateCache)
         '        <div class="clearfix"></div>' +
         '        </div>' +
         '        <div class="modal-footer">' +
-        '        <button type="submit" class="btn btn-pink" ng-click="$dismiss()" ng-show="!showLogin">Close</button>' +
-        '        <button type="submit" class="btn btn-default" ng-click="$dismiss()" ng-show="showLogin">Cancel</button>' +
+        '        <button type="submit" class="btn btn-pink" ng-click="$close()" ng-show="!showLogin">Close</button>' +
+        '        <button type="submit" class="btn btn-default" ng-click="$close()" ng-show="showLogin">Cancel</button>' +
         '        <button type="button" class="btn btn-pink" ng-click="reconnect()" ng-show="showLogin">Login</button>' +
         '        </div>' +
         '        </div>')

src/modals/dialogokcancel.html

@@ -6,9 +6,9 @@
                 <ng-transclude></ng-transclude>
             </div>
             <div class="clearfix"></div>
-            <span class="error" ng-show="submitted">
+            <!--<span class="error" ng-show="submitted">
                 <p class="error">{{ errorString }}</p>
-            </span>
+            </span>-->
         </div>
         <div class="modal-footer">
             <button type="button" class="btn btn-default" ng-click="__cancel()">Cancel</button>

src/modals/dialogokcancel.js

@@ -4,8 +4,8 @@
 
 
 angular.module('luticateUtils')
-    .directive('dialogOkCancel', [
-        function () {
+    .directive('dialogOkCancel', ['luticateDialogErrorHelper',
+        function (luticateDialogErrorHelper) {
             return {
                 restrict: 'EA',
                 transclude: true,
@@ -15,12 +15,10 @@ angular.module('luticateUtils')
                     $scope.model = {};
                     $scope.pending = false;
                     $scope.submitted = false;
-                    $scope.errorString = "";
 
                     $scope.__submit = function()
                     {
                         $scope.submitted = true;
-                        $scope.errorString = "";
                         if ($scope.form.$valid) {
                             $scope.pending = true;
                             $scope.promise = $scope.submitForm();
@@ -38,12 +36,13 @@ angular.module('luticateUtils')
                                         if ($scope.onError) {
                                             $scope.onError(error);
                                         }
-                                        if (error.Data) {
-                                            $scope.errorString = error.Data;
-                                        }
-                                        else {
-                                            $scope.errorString = error;
-                                        }
+                                        luticateDialogErrorHelper.errorDialog(error)
+                                            .result.then(function(data)
+                                            {
+                                            }, function(error2)
+                                            {
+                                                $scope.$dismiss(error);
+                                            });
                                         $scope.pending = false;
                                     });
                             }
@@ -76,9 +75,9 @@ angular.module("luticateUtils").run(["$templateCache", function($templateCache)
 '    <ng-transclude></ng-transclude>' +
 '    </div>' +
 '    <div class="clearfix"></div>' +
-'    <span class="error" ng-show="submitted">' +
+/*'    <span class="error" ng-show="submitted">' +
 '    <p class="error">{{ errorString }}</p>' +
-'</span>' +
+'</span>' +*/
 '</div>' +
 '<div class="modal-footer">' +
 '    <button type="button" class="btn btn-default" ng-click="__cancel()">Cancel</button>' +