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

Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2

This commit is contained in:
Jan Steemann 2014-09-09 23:33:31 +02:00
parent c16ddedc83 bb56982988
commit 2642888b6d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/apps/system/aardvark/frontend/js/templates/foxxActiveView.ejs
View File

@ -1,7 +1,7 @@
<script id="foxxActiveView.ejs" type="text/template"> <script id="foxxActiveView.ejs" type="text/template">
<% var appInfos = attributes.app.split(":"); %> <% var appInfos = attributes.app.split(":"); %>
<div class="iconSet"> <div class="iconSet">
<span class="icon_arangodb_settings2" alt="Edit collection properties" title="Edit collection properties"></span> <span class="icon_arangodb_settings2" alt="Edit application properties" title="Edit application properties"></span>
<span class="icon_arangodb_info" title="Show API documentation"></span> <span class="icon_arangodb_info" title="Show API documentation"></span>
</div> </div>

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

@ -556,7 +556,7 @@ exports.run = function (args) {
printf("Application %s installed successfully at mount point %s\n", printf("Application %s installed successfully at mount point %s\n",
res.appId, res.appId,
res.mount); res.mount);
printf("options used: %s", JSON.stringify(options)); printf("options used: %s\n", JSON.stringify(options));
} }
else if (type === 'replace') { else if (type === 'replace') {
if (3 < args.length) { if (3 < args.length) {

6
js/server/modules/org/arangodb/foxx/base_middleware.js
View File

@ -325,19 +325,19 @@ BaseMiddleware = function () {
} }
console.log("%s, outgoing response with status %s of type %s, body length: %d", console.log("%s, outgoing response with status %s of type %s, body length: %d",
options.mount, options.mount,
response.responseCode, response.responseCode || 200,
response.contentType, response.contentType,
bodyLength); bodyLength);
} else if (response.hasOwnProperty("bodyFromFile")) { } else if (response.hasOwnProperty("bodyFromFile")) {
console.log("%s, outgoing response with status %s of type %s, body file: %s", console.log("%s, outgoing response with status %s of type %s, body file: %s",
options.mount, options.mount,
response.responseCode, response.responseCode || 200,
response.contentType, response.contentType,
response.bodyFromFile); response.bodyFromFile);
} else { } else {
console.log("%s, outgoing response with status %s of type %s, no body", console.log("%s, outgoing response with status %s of type %s, no body",
options.mount, options.mount,
response.responseCode, response.responseCode || 200,
response.contentType); response.contentType);
} }
} }