Fauxton: update dataSize

2 files changed, 7 insertions, 5 deletions

diff --git a/src/fauxton/app/addons/databases/resources.js b/src/fauxton/app/addons/databases/resources.js
index 35101547a..1b55f8885 100644
--- a/src/fauxton/app/addons/databases/resources.js
+++ b/src/fauxton/app/addons/databases/resources.js
@@ -151,16 +151,17 @@ function(app, FauxtonAPI, Documents) {
 
       return Math.max(fileSizeInBytes, 0.1).toFixed(1) + byteUnits[i];
     },
-    diskSize: function () {
-      return this.get("disk_size");
-    },
 
     dataSize: function () {
       if (this.get("other")){
         return this.get("other").data_size;
-      }else{
+      } else if (this.get('data_size')) {
+        return this.get('data_size');
+      } else if (this.get('disk_size')) {
+        return this.get('disk_size');
+      } else {
         return 0;
-      }  
+      } 
     }
   });
 
diff --git a/src/fauxton/app/addons/databases/views.js b/src/fauxton/app/addons/databases/views.js
index df663ebc2..56001dbac 100644
--- a/src/fauxton/app/addons/databases/views.js
+++ b/src/fauxton/app/addons/databases/views.js
@@ -28,6 +28,7 @@ function(app, Components, FauxtonAPI, Databases) {
       return [this.model.fetch()];
     },
     serialize: function() {
+      console.log('db', this.model);
       return {
         encoded: app.utils.safeURLName(this.model.get("name")),
         database: this.model,