Get quota from the store if it's already set from another CIRCLE instance

circle/dashboard/models.py

@@ -162,7 +162,7 @@ class ConnectCommand(Model):
                          validators=[connect_command_template_validator])
                          validators=[connect_command_template_validator])
 
 
     class Meta:
     class Meta:
-        ordering = ('id', )
+        ordering = ('id',)
 
 
     def __unicode__(self):
     def __unicode__(self):
         return self.template
         return self.template
@@ -218,7 +218,7 @@ class Profile(Model):
                     'id': command.id,
                     'id': command.id,
                     'cmd': command.template % {
                     'cmd': command.template % {
                         'port': instance.get_connect_port(use_ipv6=use_ipv6),
                         'port': instance.get_connect_port(use_ipv6=use_ipv6),
-                        'host':  instance.get_connect_host(use_ipv6=use_ipv6),
+                        'host': instance.get_connect_host(use_ipv6=use_ipv6),
                         'password': instance.pw,
                         'password': instance.pw,
                         'username': 'cloud',
                         'username': 'cloud',
                     }} for command in commands]
                     }} for command in commands]
@@ -263,7 +263,7 @@ class Profile(Model):
         super(Profile, self).save(*args, **kwargs)
         super(Profile, self).save(*args, **kwargs)
 
 
     class Meta:
     class Meta:
-        ordering = ('id', )
+        ordering = ('id',)
         permissions = (
         permissions = (
             ('use_autocomplete', _('Can use autocomplete.')),
             ('use_autocomplete', _('Can use autocomplete.')),
         )
         )
@@ -275,7 +275,7 @@ class FutureMember(Model):
     group = ForeignKey(Group)
     group = ForeignKey(Group)
 
 
     class Meta:
     class Meta:
-        ordering = ('id', )
+        ordering = ('id',)
         unique_together = ('org_id', 'group')
         unique_together = ('org_id', 'group')
 
 
     def __unicode__(self):
     def __unicode__(self):
@@ -295,7 +295,7 @@ class GroupProfile(AclBase):
     description = TextField(blank=True)
     description = TextField(blank=True)
 
 
     class Meta:
     class Meta:
-        ordering = ('id', )
+        ordering = ('id',)
 
 
     def __unicode__(self):
     def __unicode__(self):
         return self.group.name
         return self.group.name
@@ -331,7 +331,11 @@ def create_profile(user):
     profile, created = Profile.objects.get_or_create(user=user)
     profile, created = Profile.objects.get_or_create(user=user)
 
 
     try:
     try:
-        Store(user).create_user(profile.smb_password, None, profile.disk_quota)
+        store = Store(user)
+        if store.user_exist():
+            profile.disk_quota = store.get_quota()['soft']
+            profile.save()
+        store.create_user(profile.smb_password, None, profile.disk_quota)
     except:
     except:
         logger.exception("Can't create user %s", unicode(user))
         logger.exception("Can't create user %s", unicode(user))
     return created
     return created
@@ -347,6 +351,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
     logger.debug("Register save_org_id to djangosaml2 pre_user_save")
     logger.debug("Register save_org_id to djangosaml2 pre_user_save")
     from djangosaml2.signals import pre_user_save
     from djangosaml2.signals import pre_user_save
 
 
+
     def save_org_id(sender, instance, attributes, **kwargs):
     def save_org_id(sender, instance, attributes, **kwargs):
         logger.debug("save_org_id called by %s", instance.username)
         logger.debug("save_org_id called by %s", instance.username)
         atr = settings.SAML_ORG_ID_ATTRIBUTE
         atr = settings.SAML_ORG_ID_ATTRIBUTE
@@ -399,6 +404,7 @@ if hasattr(settings, 'SAML_ORG_ID_ATTRIBUTE'):
 
 
         return False  # User did not change
         return False  # User did not change
 
 
+
     pre_user_save.connect(save_org_id)
     pre_user_save.connect(save_org_id)