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

bugfix: user extra attribuet now called userData

This commit is contained in:
Heiko Kernbach 2014-11-07 16:19:24 +01:00
parent 3c13953b23
commit 6db183c681
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/apps/system/aardvark/aardvark.js
View File

@ -407,7 +407,8 @@ controller.get("/query/download/:user", function(req, res) {
res.set("Content-Type", "application/json");
res.set("Content-Disposition", "attachment; filename=queries.json");
res.json(result.extra.queries);
res.json(result.userData.queries);
}).summary("Download all user queries")
.notes("This function downloads all user queries from the given user");
@ -424,7 +425,6 @@ controller.get("/query/result/download/:query", function(req, res) {
var internal = require("internal");
query = internal.base64Decode(query);
internal.print(query);
try {
parsedQuery = JSON.parse(query);
}

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

@ -298,7 +298,7 @@
var inputEditor = ace.edit("aqlEditor");
var query = inputEditor.getValue();
if (query !== '' || query !== undefined || query !== null) {
window.open(encodeURI("query/result/download/" + btoa(JSON.stringify({ query: query }))));
window.open("query/result/download/" + encodeURIComponent(btoa(JSON.stringify({ query: query }))));
}
else {
arangoHelper.arangoError("Query error", "could not query result.");
@ -326,7 +326,7 @@
});
window.open(encodeURI("query/download/" + name));
window.open("query/download/" + encodeURIComponent(name));
},
deselect: function (editor) {