From 7f002ac61222cf54d184bf8096655697d1fe8265 Mon Sep 17 00:00:00 2001 From: Matt Wright Date: Mon, 26 Nov 2012 14:41:51 -0500 Subject: [PATCH] Fixes #40 --- flask_security/datastore.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/flask_security/datastore.py b/flask_security/datastore.py index 975c0f0..f518b9a 100644 --- a/flask_security/datastore.py +++ b/flask_security/datastore.py @@ -56,8 +56,11 @@ class UserDatastore(object): self.role_model = role_model def _prepare_role_modify_args(self, user, role): - role = role.name if isinstance(role, self.role_model) else role - return self.find_user(email=user.email), self.find_role(role) + if isinstance(user, basestring): + user = self.find_user(email=user.email) + if isinstance(role, basestring): + role = self.find_role(role) + return user, role def _prepare_create_user_args(self, **kwargs): kwargs.setdefault('active', True)