removed async calls

js/apps/system/_admin/aardvark/APP/frontend/js/models/arangoCollectionModel.js

@@ -17,59 +17,50 @@
       desc: undefined
     },
 
-    getProperties: function () {
+    getProperties: function (callback) {
-      var data2;
       $.ajax({
         type: "GET",
         cache: false,
         url: "/_api/collection/" + encodeURIComponent(this.get("id")) + "/properties",
         contentType: "application/json",
         processData: false,
-        async: false,
         success: function(data) {
-          data2 = data;
+          callback(false, data);
         },
         error: function(data) {
-          data2 = data;
+          callback(true, data);
         }
       });
-      return data2;
     },
-    getFigures: function () {
+    getFigures: function (callback) {
-      var data2;
       $.ajax({
         type: "GET",
         cache: false,
         url: "/_api/collection/" + this.get("id") + "/figures",
         contentType: "application/json",
         processData: false,
-        async: false,
         success: function(data) {
-          data2 = data;
+          callback(false, data);
         },
-        error: function(data) {
+        error: function() {
-          data2 = data;
+          callback(true);
         }
       });
-      return data2;
     },
-    getRevision: function () {
+    getRevision: function (callback, figures) {
-      var data2;
       $.ajax({
         type: "GET",
         cache: false,
         url: "/_api/collection/" + this.get("id") + "/revision",
         contentType: "application/json",
         processData: false,
-        async: false,
         success: function(data) {
-          data2 = data;
+          callback(false, data, figures);
         },
-        error: function(data) {
+        error: function() {
-          data2 = data;
+          callback(true);
         }
       });
-      return data2;
     },
 
     getIndex: function (callback) {

js/apps/system/_admin/aardvark/APP/frontend/js/templates/modalCollectionInfo.ejs

@@ -1,8 +1,7 @@
 <script id="modalCollectionInfo.ejs" type="text/template">
 <%
-    var figuresData = content.getFigures();
+    var figuresData = content.figures;
-    var revision    = content.getRevision();
+    var revision    = content.revision;
-    var index       = content.getIndex();
 %>
 
     <ul id="infoTab" class="nav nav-tabs">
@@ -50,7 +49,7 @@
             <th class="collectionInfoTh2">ID:</th>
             <th class="collectionInfoTh">
               <div id="show-collection-id" class="modal-text">
-                <%=content.get("id")%>
+                <%=content.model.get("id")%>
               </div>
             <th>
           </tr>
@@ -67,14 +66,14 @@
           <tr>
             <th class="collectionInfoTh2">Type:</th>
             <th class="collectionInfoTh">
-              <div class="modal-text"><%=content.get("type")%></div>
+              <div class="modal-text"><%=content.model.get("type")%></div>
             </th>
           </tr>
 
           <tr>
             <th class="collectionInfoTh2">Status:</th>
             <th class="collectionInfoTh">
-              <div class="modal-text"><%=content.get("status")%></div>
+              <div class="modal-text"><%=content.model.get("status")%></div>
             </th>
           </tr>
           

js/apps/system/_admin/aardvark/APP/frontend/js/views/collectionsItemView.js

@@ -270,9 +270,15 @@
       }
 
       if (collectionIsLoaded) {
-        // needs to be refactored. move getProperties into model
+
-        var journalSize = this.model.getProperties().journalSize;
+        var callback = function(error, data) {
-        journalSize = journalSize/(1024*1024);
+          if (error) {
+            arangoHelper.arangoError("Collection", "Could not fetch properties");
+          }
+          else {
+            var journalSize = data.journalSize/(1024*1024);
+            var indexBuckets = data.indexBuckets;
+            var wfs = data.waitForSync;
 
             tableContent.push(
               window.modalView.createTextEntry(
@@ -291,8 +297,6 @@
               )
             );
 
-        var indexBuckets = this.model.getProperties().indexBuckets;
-        
           tableContent.push(
             window.modalView.createTextEntry(
               "change-index-buckets",
@@ -311,7 +315,6 @@
           );
 
           // prevent "unexpected sync method error"
-        var wfs = this.model.getProperties().waitForSync;
           tableContent.push(
             window.modalView.createSelectEntry(
               "change-collection-sync",
@@ -320,7 +323,6 @@
               "Synchronize to disk before returning from a create or update of a document.",
               [{value: false, label: "No"}, {value: true, label: "Yes"}]        )
           );
-      }
 
           tableContent.push(
             window.modalView.createReadOnlyEntry(
@@ -389,6 +391,12 @@
           else {
             $($('#infoTab').children()[1]).remove();
           }
+        }
+
+        }.bind(this);
+
+      this.model.getProperties(callback);
+    }
   },
 
   bindIndexEvents: function() {
@@ -462,14 +470,38 @@
   },
 
   createInfoModal: function() {
-      var buttons = [],
+
-        tableContent = this.model;
+    var callbackRev = function(error, revision, figures) {
+      if (error) {
+        arangoHelper.arangoError("Figures", "Could not get revision.");        
+      }
+      else {
+        var buttons = [];
+        var tableContent = {
+          figures: figures,
+          revision: revision,
+          model: this.model
+        };
         window.modalView.show(
           "modalCollectionInfo.ejs",
           "Collection: " + this.model.get('name'),
           buttons,
           tableContent
         );
+      }
+    }.bind(this);
+
+    var callback = function(error, data) {
+      if (error) {
+        arangoHelper.arangoError("Figures", "Could not get figures.");        
+      }
+      else {
+        var figures = data;
+        this.model.getRevision(callbackRev, figures);
+      }
+    }.bind(this);
+
+    this.model.getFigures(callback);
   },
   //index functions
   resetIndexForms: function () {
@@ -482,7 +514,6 @@
     //e.preventDefault();
     var self = this;
     var indexType = $('#newIndexType').val();
-      var result;
     var postParameter = {};
     var fields;
     var unique;