Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed bug for ArangoDB internal errors, they have not properly been presented to the user in the Graph Management

This commit is contained in:
Michael Hackstein 2013-12-02 15:36:33 +01:00
parent 3004232b57
commit 1697e3c326
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/apps/system/aardvark/frontend/js/views/addNewGraphView.js
View File

@ -50,8 +50,14 @@
success: function() { success: function() {
self.hide(); self.hide();
}, },
error: function(err) { error: function(obj, err) {
arangoHelper.arangoError(err.errorMessage); 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);
} }
}); });
}, },

12
js/apps/system/aardvark/test/specs/views/addNewGraphViewSpec.js
View File

@ -187,11 +187,13 @@
$(eField).val(e); $(eField).val(e);
graphs.create.andCallFake(function (info, opts) { graphs.create.andCallFake(function (info, opts) {
expect(opts.error).toBeDefined(); expect(opts.error).toBeDefined();
opts.error({ opts.error(info, {
error: true, responseText: JSON.stringify({
code: 400, error: true,
errorNum: 1093, code: 400,
errorMessage: errMsg errorNum: 1093,
errorMessage: errMsg
})
}); });
}); });
spyOn(arangoHelper, "arangoError"); spyOn(arangoHelper, "arangoError");