You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ja...@apache.org on 2010/06/25 16:23:34 UTC

svn commit: r957978 - /couchdb/branches/0.11.x/share/www/script/futon.js

Author: jan
Date: Fri Jun 25 14:23:34 2010
New Revision: 957978

URL: http://svn.apache.org/viewvc?rev=957978&view=rev
Log:
Merge r957808 from trunk:

fix the Futon issue where you have to cancel the admin dialog box after putting back admins that were removed to run the tests

Modified:
    couchdb/branches/0.11.x/share/www/script/futon.js

Modified: couchdb/branches/0.11.x/share/www/script/futon.js
URL: http://svn.apache.org/viewvc/couchdb/branches/0.11.x/share/www/script/futon.js?rev=957978&r1=957977&r2=957978&view=diff
==============================================================================
--- couchdb/branches/0.11.x/share/www/script/futon.js (original)
+++ couchdb/branches/0.11.x/share/www/script/futon.js Fri Jun 25 14:23:34 2010
@@ -87,7 +87,11 @@ function $$(node) {
                   return;
                 }
                 doSignup(data.name, null, function(errors) {
-                  callback(errors);
+                  if (errors && errors.name && errors.name.indexOf && errors.name.indexOf("taken") == -1) {
+                    callback(errors);
+                  } else {
+                    callback();
+                  }
                   }, false);
                 });            
             }