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

Changed internal app validation path to be absolute and not relative to the user defined js app path

This commit is contained in:
Michael Hackstein 2015-03-09 14:46:00 +01:00
parent 391065c210
commit 6adbab0bf6
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/server/modules/org/arangodb/foxx/arangoApp.js
View File

@ -141,7 +141,10 @@ var isSystemMount = function(mount) {
/// @brief returns the root path for application. Knows about system apps
////////////////////////////////////////////////////////////////////////////////
var computeRootAppPath = function(mount) {
var computeRootAppPath = function(mount, isValidation) {
if (isValidation) {
return "";
}
if (isSystemMount(mount)) {
return module.systemAppPath();
}
@ -168,7 +171,7 @@ var computeRootAppPath = function(mount) {
}
this._name = this._manifest.name;
this._version = this._manifest.version;
this._root = computeRootAppPath(config.mount);
this._root = computeRootAppPath(config.mount, config.id === "__internal");
this._path = config.path;
this._options = config.options;
this._mount = config.mount;

2
js/server/modules/org/arangodb/foxx/manager.js
View File

@ -391,7 +391,7 @@
var fakeAppConfig = function(path) {
var file = fs.join(path, "manifest.json");
return {
id: "/internal",
id: "__internal",
root: "",
path: path,
options: {},