From 05a46445d9fd4637966a838122148bac81962fd0 Mon Sep 17 00:00:00 2001 From: Roberto Rosario Date: Thu, 26 May 2016 14:47:41 -0400 Subject: [PATCH] Don't use on_organization as we may be operating on an organization that is not our own. Return the username and password to be used for tests. --- mayan/apps/organizations/models.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/mayan/apps/organizations/models.py b/mayan/apps/organizations/models.py index fabf7f8b89..41e1d95af1 100644 --- a/mayan/apps/organizations/models.py +++ b/mayan/apps/organizations/models.py @@ -109,8 +109,8 @@ class Organization(models.Model): } ) - account = UserModel.on_organization.get( - **{UserModel.USERNAME_FIELD: username} + account = UserModel.objects.get( + **{UserModel.USERNAME_FIELD: username, 'organization': self,} ) account.set_password(raw_password=password_value) account.save() @@ -120,6 +120,8 @@ class Organization(models.Model): for permission in Permission.all(): role.permissions.add(permission.stored_permission) + + return account, password_value else: logger.error( 'Organization admin user already exists. -- login: %s',