couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From robertkowal...@apache.org
Subject [4/6] fauxton commit: updated refs/heads/import-master to 2d2cc24
Date Mon, 14 Jul 2014 21:21:40 GMT
Fauxton: verifyinstall fix for PouchDB Server

Closes COUCHDB-2266


Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/b9a5eaef
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/b9a5eaef
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/b9a5eaef

Branch: refs/heads/import-master
Commit: b9a5eaefefe57abd325a779253a75781dc55798f
Parents: 8b80c95
Author: Nolan Lawson <nolan.lawson@gmail.com>
Authored: Fri Jul 11 17:28:43 2014 -0700
Committer: Alexander Shorin <kxepal@apache.org>
Committed: Mon Jul 14 12:39:21 2014 +0400

----------------------------------------------------------------------
 app/addons/verifyinstall/resources.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/b9a5eaef/app/addons/verifyinstall/resources.js
----------------------------------------------------------------------
diff --git a/app/addons/verifyinstall/resources.js b/app/addons/verifyinstall/resources.js
index aa08997..86b8165 100644
--- a/app/addons/verifyinstall/resources.js
+++ b/app/addons/verifyinstall/resources.js
@@ -86,7 +86,8 @@ function (app, FauxtonAPI, Databases, Documents) {
       var promise = $.get(viewDoc.url() + '/_view/testview');
 
       promise.then(function (resp) { 
-        var row = JSON.parse(resp).rows[0];
+        resp = _.isString(resp) ? JSON.parse(resp) : resp;
+        var row = resp.rows[0];
         if (row.value === 6) {
           return deferred.resolve();
         }


Mime
View raw message