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 devel

This commit is contained in:
scottashton 2014-03-05 11:21:21 +01:00
parent 11b11412b6 d7de23a6c9
commit 8f79530954
6 changed files with 32 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arangod/RestHandler/RestPleaseUpgradeHandler.cpp
View File

@ -81,7 +81,7 @@ HttpHandler::status_t RestPleaseUpgradeHandler::execute () {
/// {@inheritDoc} /// {@inheritDoc}
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void RestPleaseUpgradeHandler::handleError (triagens::basics::TriagensError const&) { void RestPleaseUpgradeHandler::handleError (TriagensError const&) {
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------

12
js/apps/system/aardvark/frontend/js/collections/arangoCollections.js
View File

@ -1,7 +1,9 @@
/*jslint indent: 2, nomen: true, maxlen: 100, sloppy: true, vars: true, white: true, plusplus: true */ /*jslint indent: 2, nomen: true, maxlen: 100, vars: true, white: true, plusplus: true, stupid: true*/
/*global require, exports, Backbone, window, arangoCollection, $, arangoHelper, data */ /*global require, exports, Backbone, window, arangoCollection, $, arangoHelper, data */
(function() {
"use strict";
window.arangoCollections = Backbone.Collection.extend({ window.arangoCollections = Backbone.Collection.extend({
url: '/_api/collection', url: '/_api/collection',
model: arangoCollection, model: arangoCollection,
@ -272,11 +274,10 @@ window.arangoCollections = Backbone.Collection.extend({
data.isSystem = isSystem; data.isSystem = isSystem;
data.type = collType; data.type = collType;
if (shards) { if (shards) {
data.numberOfShards = shards, data.numberOfShards = shards;
data.shardKeys = keys; data.shardKeys = keys;
} }
returnobj.status = false; returnobj.status = false;
console.log(data);
$.ajax({ $.ajax({
cache: false, cache: false,
type: "POST", type: "POST",
@ -409,4 +410,5 @@ window.arangoCollections = Backbone.Collection.extend({
} }
}); });
} }
}); });
}());

2
js/apps/system/aardvark/frontend/js/routers/router.js
View File

@ -466,7 +466,7 @@
}); });
} }
this.userManagementView.render(); this.userManagementView.render();
this.naviView.selectMenuItem('user-menu'); this.naviView.selectMenuItem('tools-menu');
}, },
userProfile: function() { userProfile: function() {

7
js/apps/system/aardvark/frontend/js/templates/collectionsView.ejs
View File

@ -11,12 +11,15 @@
</ul> </ul>
</div> </div>
<div id="transparentPlaceholder"> <div class="pull-left">
<input type="text" id="searchInput" class="searchInput" placeholder="Search..."><img id="searchSubmit" width="16" height="16" src="img/enter_icon.png"> <a class="arangoHeader">Collections</a>
</div> </div>
<div class="searchField pull-left">
<input type="text" id="searchInput" class="searchInput" placeholder="Search..."/><img id="searchSubmit" width="16" height="16" src="img/enter_icon.png" class="searchSubmitIcon" />
</div> </div>
<div id="collectionsDropdown2" class="headerDropdown"> <div id="collectionsDropdown2" class="headerDropdown">
<div id="collectionsDropdown" class="dropdownInner"> <div id="collectionsDropdown" class="dropdownInner">

6
js/apps/system/aardvark/frontend/js/views/newCollectionView.js
View File

@ -1,5 +1,5 @@
/*jslint indent: 2, nomen: true, maxlen: 100, vars: true, white: true, plusplus: true */ /*jslint indent: 2, nomen: true, maxlen: 100, vars: true, white: true, plusplus: true */
/*global require, exports, Backbone, EJS, $, window, arangoHelper, templateEngine*/ /*global require, exports, Backbone, EJS, $, window, arangoHelper, templateEngine, _*/
(function (){ (function (){
"use strict"; "use strict";
@ -79,7 +79,9 @@
} }
shards = parseInt(shards, 10); shards = parseInt(shards, 10);
if (shards < 1) { if (shards < 1) {
arangoHelper.arangoError("Number of shards has to be an integer value greater or equal 1"); arangoHelper.arangoError(
"Number of shards has to be an integer value greater or equal 1"
);
return 0; return 0;
} }
shardBy = _.pluck($('#new-collection-shardBy').select2("data"), "text"); shardBy = _.pluck($('#new-collection-shardBy').select2("data"), "text");