From 1697e3c3264d25560cf7725134f8ecbc42f05522 Mon Sep 17 00:00:00 2001 From: Michael Hackstein Date: Mon, 2 Dec 2013 15:36:33 +0100 Subject: [PATCH] Fixed bug for ArangoDB internal errors, they have not properly been presented to the user in the Graph Management --- .../aardvark/frontend/js/views/addNewGraphView.js | 10 ++++++++-- .../aardvark/test/specs/views/addNewGraphViewSpec.js | 12 +++++++----- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/js/apps/system/aardvark/frontend/js/views/addNewGraphView.js b/js/apps/system/aardvark/frontend/js/views/addNewGraphView.js index f5f9523a1c..01427a667a 100644 --- a/js/apps/system/aardvark/frontend/js/views/addNewGraphView.js +++ b/js/apps/system/aardvark/frontend/js/views/addNewGraphView.js @@ -50,8 +50,14 @@ success: function() { self.hide(); }, - error: function(err) { - arangoHelper.arangoError(err.errorMessage); + error: function(obj, err) { + var response = JSON.parse(err.responseText), + msg = response.errorMessage; + // Gritter does not display <> + msg = msg.replace("<", ""); + msg = msg.replace(">", ""); + console.log(msg); + arangoHelper.arangoError(msg); } }); }, diff --git a/js/apps/system/aardvark/test/specs/views/addNewGraphViewSpec.js b/js/apps/system/aardvark/test/specs/views/addNewGraphViewSpec.js index 9ac9bb60b5..a38c34371e 100644 --- a/js/apps/system/aardvark/test/specs/views/addNewGraphViewSpec.js +++ b/js/apps/system/aardvark/test/specs/views/addNewGraphViewSpec.js @@ -187,11 +187,13 @@ $(eField).val(e); graphs.create.andCallFake(function (info, opts) { expect(opts.error).toBeDefined(); - opts.error({ - error: true, - code: 400, - errorNum: 1093, - errorMessage: errMsg + opts.error(info, { + responseText: JSON.stringify({ + error: true, + code: 400, + errorNum: 1093, + errorMessage: errMsg + }) }); }); spyOn(arangoHelper, "arangoError");