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:
Jan Steemann 2014-04-04 14:57:29 +02:00
parent 282f510e34 b5f1253ac4
commit a33261fac5
4 changed files with 2774 additions and 1803 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/apps/system/aardvark/frontend/js/views/databaseView.js
View File

@ -91,7 +91,6 @@
var userName = $('#newUser').val(); var userName = $('#newUser').val();
var userPassword = $('#newPassword').val(); var userPassword = $('#newPassword').val();
if (!this.validateDatabaseInfo(name, userName, userPassword)) { if (!this.validateDatabaseInfo(name, userName, userPassword)) {
console.log("VALIDATE");
return; return;
} }
var options = { var options = {

17
js/apps/system/aardvark/frontend/js/views/documentsView.js
View File

@ -498,24 +498,11 @@
drawTable: function() { drawTable: function() {
var self = this; var self = this;
/* if (window.arangoDocumentsStore.models.length === 0) {
if (this.addDocumentSwitch === true) {
$(self.table).dataTable().fnAddData(
[
'<a id="plusIconDoc" style="padding-left: 30px">Add document</a>',
'',
'<img src="img/plus_icon.png" id="documentAddBtn"></img>'
]
);
}*/
if (window.arangoDocumentsStore.models.length === 0) {
$('.dataTables_empty').text('No documents'); $('.dataTables_empty').text('No documents');
} }
else { else {
$.each(window.arangoDocumentsStore.models, function(key, value) { $.each(window.arangoDocumentsStore.models, function(key, value) {
var tempObj = {}; var tempObj = {};
$.each(value.attributes.content, function(k, v) { $.each(value.attributes.content, function(k, v) {
if (! (k === '_id' || k === '_rev' || k === '_key')) { if (! (k === '_id' || k === '_rev' || k === '_key')) {
@ -679,7 +666,7 @@
}); });
return fields; return fields;
}, },
createIndex: function (e) { createIndex: function () {
//e.preventDefault(); //e.preventDefault();
var self = this; var self = this;
var collection = this.collectionName; var collection = this.collectionName;

4
js/apps/system/aardvark/test/specs/collections/arangoCollectionsSpec.js
View File

@ -287,7 +287,7 @@
expect(opt.processData).toEqual(false); expect(opt.processData).toEqual(false);
expect(opt.data).toEqual(JSON.stringify( expect(opt.data).toEqual(JSON.stringify(
{ {
name: "heinz", waitForSync: true, isSystem: true, name: "heinz", waitForSync: true, journalSize :2, isSystem: true,
type: 3, numberOfShards: 3, shardKeys: ["a", "b", "c"] type: 3, numberOfShards: 3, shardKeys: ["a", "b", "c"]
} }
)); ));
@ -310,7 +310,7 @@
expect(opt.processData).toEqual(false); expect(opt.processData).toEqual(false);
expect(opt.data).toEqual(JSON.stringify( expect(opt.data).toEqual(JSON.stringify(
{ {
name: "heinz", waitForSync: true, isSystem: true, name: "heinz", waitForSync: true, journalSize: 2, isSystem: true,
type: 3, numberOfShards: 3, shardKeys: ["a", "b", "c"] type: 3, numberOfShards: 3, shardKeys: ["a", "b", "c"]
} }
)); ));

4555
js/apps/system/aardvark/test/specs/views/documentsViewSpec.js
View File

File diff suppressed because it is too large Load Diff