You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ro...@apache.org on 2014/07/12 16:30:20 UTC

fauxton commit: updated refs/heads/import-master to 92eab74

Repository: couchdb-fauxton
Updated Branches:
  refs/heads/import-master 2a1624276 -> 92eab7414


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/92eab741
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/92eab741
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/92eab741

Branch: refs/heads/import-master
Commit: 92eab741435782b24421fbf5788c8b93d577c6c2
Parents: 2a16242
Author: Nolan Lawson <no...@gmail.com>
Authored: Fri Jul 11 17:28:43 2014 -0700
Committer: Robert Kowalski <ro...@kowalski.gd>
Committed: Sat Jul 12 16:29:34 2014 +0200

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


http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/92eab741/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();
         }