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

Merge pull request #1148 from triAGENS/correct-horse-battery-staple 

Dev app baseUrls should be db-relative too
This commit is contained in:
Jan Steemann 2014-12-03 11:58:38 +01:00
parent 3b5b6b2249 7b01edbb4c
commit 8af441da56
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -547,7 +547,7 @@ function executeAppScript (app, name, mount, prefix) {
appContext.options = app._options; appContext.options = app._options;
appContext.configuration = app._options.configuration; appContext.configuration = app._options.configuration;
appContext.basePath = fs.join(root, app._path); appContext.basePath = fs.join(root, app._path);
appContext.baseUrl = devel ? mount : '/_db/' + encodeURIComponent(arangodb.db._name()) + mount; appContext.baseUrl = '/_db/' + encodeURIComponent(arangodb.db._name()) + mount;
appContext.isDevelopment = devel; appContext.isDevelopment = devel;
appContext.isProduction = ! devel; appContext.isProduction = ! devel;
@ -776,7 +776,7 @@ function routingAalApp (app, mount, options) {
appContextTempl.configuration = app._options.configuration; appContextTempl.configuration = app._options.configuration;
appContextTempl.collectionPrefix = prefix; // collection prefix appContextTempl.collectionPrefix = prefix; // collection prefix
appContextTempl.basePath = fs.join(root, app._path); appContextTempl.basePath = fs.join(root, app._path);
appContextTempl.baseUrl = devel ? mount : '/_db/' + encodeURIComponent(arangodb.db._name()) + mount; appContextTempl.baseUrl = '/_db/' + encodeURIComponent(arangodb.db._name()) + mount;
appContextTempl.isDevelopment = devel; appContextTempl.isDevelopment = devel;
appContextTempl.isProduction = ! devel; appContextTempl.isProduction = ! devel;