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

Merge branch 'foxx-pathes' of github.com:triAGENS/ArangoDB into foxx-pathes 

Conflicts:
	js/client/modules/org/arangodb/foxx/manager.js
	js/common/modules/org/arangodb/foxx/manager-utils.js
	js/common/modules/org/arangodb/foxx/store.js
	js/server/modules/org/arangodb/foxx/manager.js
This commit is contained in:
Michael Hackstein 2015-01-26 16:53:34 +01:00
parent c72a967e0d da290aad79
commit 8e562b2268
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/client/modules/org/arangodb/foxx/manager.js
View File

@ -213,7 +213,6 @@
var req = {
mount: mount,
};
res = arango.POST("/_admin/foxx/setup", JSON.stringify(req));
arangosh.checkRequestResult(res);
return {
@ -502,8 +501,6 @@
}
};
// -----------------------------------------------------------------------------
// --SECTION-- exports
// -----------------------------------------------------------------------------

4
js/common/modules/org/arangodb/foxx/manager-utils.js
View File

@ -384,7 +384,7 @@ function mountedApp (mount) {
}
////////////////////////////////////////////////////////////////////////////////
/// @brief get the app mounted at this mount point
/// @brief Update the app mounted at this mountpoint with the new app
////////////////////////////////////////////////////////////////////////////////
function updateApp (mount, update) {
"use strict";
@ -424,13 +424,13 @@ var zipDirectory = function(directory) {
files.push(tree[i]);
}
}
if (files.length === 0) {
throwFileNotFound("Directory '" + String(directory) + "' is empty");
}
fs.zipFile(tempFile, directory, files);
return tempFile;
};
////////////////////////////////////////////////////////////////////////////////
/// @brief Exports
////////////////////////////////////////////////////////////////////////////////

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

@ -468,7 +468,6 @@
catch (err1) {
arangodb.printf("Cannot remove temporary folder '%s'\n", tempFile);
}
};
////////////////////////////////////////////////////////////////////////////////
@ -804,6 +803,10 @@
return app.simpleJSON();
};
////////////////////////////////////////////////////////////////////////////////
/// @brief Configure the app at the mountpoint
////////////////////////////////////////////////////////////////////////////////
var configure = function(mount, options) {
checkParameter(
"configure(<mount>)",
@ -819,6 +822,10 @@
return app.simpleJSON();
};
////////////////////////////////////////////////////////////////////////////////
/// @brief Get the configuration for the app at the given mountpoint
////////////////////////////////////////////////////////////////////////////////
var configuration = function(mount) {
checkParameter(
"configuration(<mount>)",
@ -828,6 +835,7 @@
return app.getConfiguration();
};
// -----------------------------------------------------------------------------
// --SECTION-- exports
// -----------------------------------------------------------------------------