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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel

This commit is contained in:
Jan Steemann 2014-11-12 14:51:35 +01:00
parent 81c1919f44 3fdcfe584e
commit d4084e97e4
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/actions/api-endpoint.js
View File

@ -226,8 +226,8 @@ var internal = require("internal");
/// database only. Calling this action in any other database will make the server /// database only. Calling this action in any other database will make the server
/// return an error. /// return an error.
/// ///
/// Futhermore, the last remaining endpoint cannot be deleted as this would /// Futhermore, the last remaining endpoint cannot be deleted as this would make
/// render the server's HTTP interface useless. /// the server kaputt.
/// ///
/// @RESTRETURNCODES /// @RESTRETURNCODES
/// ///

12
js/apps/system/aardvark/frontend/js/views/queryView.js
View File

@ -597,7 +597,17 @@
contentType: "application/json", contentType: "application/json",
processData: false, processData: false,
success: function (data) { success: function (data) {
outputEditor.setValue(JSON.stringify(data.result, undefined, 2)); var warnings = "";
if (data.extra.warnings.length > 0) {
warnings += "Warnings:" + "\r\n\r\n";
data.extra.warnings.forEach(function(w) {
warnings += "[" + w.code + "], '" + w.message + "'\r\n";
});
}
if (warnings !== "") {
warnings += "\r\n" + "Result:" + "\r\n\r\n";
}
outputEditor.setValue(warnings + JSON.stringify(data.result, undefined, 2));
self.switchTab("result-switch"); self.switchTab("result-switch");
window.progressView.hide(); window.progressView.hide();
self.deselect(outputEditor); self.deselect(outputEditor);