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

js/apps/system/aardvark/frontend/js/views/databaseView.js

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

js/apps/system/aardvark/frontend/js/views/documentsView.js

@@ -498,24 +498,11 @@
     drawTable: function() {
       var self = this;
 
-      /*
-         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) {
+        if (window.arangoDocumentsStore.models.length === 0) {
         $('.dataTables_empty').text('No documents');
       }
       else {
-
         $.each(window.arangoDocumentsStore.models, function(key, value) {
-
           var tempObj = {};
           $.each(value.attributes.content, function(k, v) {
             if (! (k === '_id' || k === '_rev' || k === '_key')) {
@@ -679,7 +666,7 @@
       });
       return fields;
     },
-    createIndex: function (e) {
+    createIndex: function () {
       //e.preventDefault();
       var self = this;
       var collection = this.collectionName;

js/apps/system/aardvark/test/specs/collections/arangoCollectionsSpec.js

@@ -287,7 +287,7 @@
                 expect(opt.processData).toEqual(false);
                 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"]
                     }
                 ));
@@ -310,7 +310,7 @@
                 expect(opt.processData).toEqual(false);
                 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"]
                     }
                 ));