Merge pull request TryGhost#3437 from morficus/issue-3433

Error when inviting users
morficus · Jul 29, 2014 · 9343bcc · 9343bcc
2 parents e8bb8e2 + e15fb9e
commit 9343bcc
Show file tree

Hide file tree

Showing 2 changed files with 234 additions and 226 deletions.
diff --git a/core/server/models/user.js b/core/server/models/user.js
@@ -392,6 +392,14 @@ User = ghostBookshelf.Model.extend({
         }).then(function (addedUser) {
             // Assign the userData to our created user so we can pass it back
             userData = addedUser;
+            //if we are given a "role" object, only pass in the role ID in place of the full object
+            roles = _.map(roles, function (role) {
+                if (_.isNumber(role)) {
+                    return role;
+                } else {
+                    return parseInt(role.id, 10);
+                }
+            });
 
             return userData.roles().attach(roles);
         }).then(function () {