Merge pull request #390 from nextcloud/fix/add-new-accountnightly-20170612

Fix adding a new account

1 files changed, 11 insertions, 1 deletions

diff --git a/js/service/accountservice.js b/js/service/accountservice.js
index 9bc9c33ff..c7b09250e 100644
--- a/js/service/accountservice.js
+++ b/js/service/accountservice.js
@@ -64,7 +64,17 @@ define(function(require) {
 			return Promise.resolve(accounts);
 		}
 
-		return Promise.resolve(accounts.fetch());
+		return new Promise(function(resolve, reject) {
+			accounts.fetch({
+				success: function() {
+					// fetch resolves the Promise with the raw data returned by
+					// the ajax call. Since we want the Backbone models, we have
+					// to 'convert' the response here.
+					resolve(accounts);
+				},
+				error: reject
+			});
+		});
 	}
 
 	function getAccountEntities() {