From 6c5d1a626755df951836955fcff5a339367f154a Mon Sep 17 00:00:00 2001
From: Jason Williams <jaswilli@gmail.com>
Date: Tue, 22 Jul 2014 05:27:50 +0000
Subject: [PATCH] Update Users API to handle role objects or ids

Closes #3357
- API method User#edit now handles User objects that have either
  an array of Role ids or objects.
- Fixed error handler notification on upload modal controller.
---
 ghost/admin/controllers/modals/upload.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/ghost/admin/controllers/modals/upload.js b/ghost/admin/controllers/modals/upload.js
index 1664b93a56..64c3f9e0ee 100644
--- a/ghost/admin/controllers/modals/upload.js
+++ b/ghost/admin/controllers/modals/upload.js
@@ -8,7 +8,9 @@ var UploadController = Ember.Controller.extend({
             this.get('model').save().then(function (model) {
                 self.notifications.showSuccess('Saved');
                 return model;
-            }).catch(this.notifications.showErrors);
+            }).catch(function (err) {
+                self.notifications.showErrors(err);
+            });
         },
 
         confirmReject: function () {