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

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

This commit is contained in:
Max Neunhoeffer 2016-06-03 06:37:25 -06:00
parent ee3216b021 1ec181a675
commit 02f2f8b0b4
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/actions/_api/user/app.js
View File

@ -36,11 +36,6 @@ function get_api_user(req, res) {
return;
}
if (req.suffix.length !== 1) {
actions.resultBad(req, res, arangodb.ERROR_HTTP_BAD_PARAMETER);
return;
}
var user = decodeURIComponent(req.suffix[0]);
try {
@ -81,6 +76,8 @@ function get_api_config(req, res, key) {
function get_api_user_or_config(req, res) {
if (req.suffix.length === 0) {
get_api_user(req, res);
} else if (req.suffix.length === 1) {
get_api_user(req, res);
} else if (req.suffix.length === 2) {
if (req.suffix[1] === "config") {
get_api_config(req, res, null);

3
lib/ProgramOptions/Translator.cpp
View File

@ -21,7 +21,8 @@
////////////////////////////////////////////////////////////////////////////////
#include "Translator.h"
#include "Basics/tri-strings.h"
#include "Basics/files.h"
std::string arangodb::options::EnvironmentTranslator(std::string const& value) {
if (value.empty()) {
return value;