Merge branch 'issue-269' into 'master'

Issue #269

circle/dashboard/models.py

@@ -261,7 +261,7 @@ def get_or_create_profile(self):
 Group.profile = property(get_or_create_profile)
 
 
-def create_profile(sender, user, request, **kwargs):
+def create_profile(user):
     if not user.pk:
         return False
     profile, created = Profile.objects.get_or_create(user=user)
@@ -272,7 +272,11 @@ def create_profile(sender, user, request, **kwargs):
         logger.exception("Can't create user %s", unicode(user))
     return created
 
-user_logged_in.connect(create_profile)
+
+def create_profile_hook(sender, user, request, **kwargs):
+    return create_profile(user)
+
+user_logged_in.connect(create_profile_hook)
 
 if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
     logger.debug("Register save_org_id to djangosaml2 pre_user_save")

circle/dashboard/views.py

@@ -91,7 +91,7 @@ from vm.models import (
 from storage.models import Disk
 from firewall.models import Vlan, Host, Rule
 from .models import (Favourite, Profile, GroupProfile, FutureMember,
-                     ConnectCommand)
+                     ConnectCommand, create_profile)
 
 from .store_api import Store, NoStoreException, NotOkException
 
@@ -3288,6 +3288,7 @@ class UserCreationView(LoginRequiredMixin, PermissionRequiredMixin,
         self.get_group(group_pk)
         ret = super(UserCreationView, self).post(*args, **kwargs)
         if self.object:
+            create_profile(self.object)
             self.object.groups.add(self.group)
             return redirect(
                 reverse('dashboard.views.group-detail', args=[group_pk]))