Commit b6523da6 authored by ibuler's avatar ibuler

[Update] 修改外键为org_id

parent c24f1a05
...@@ -225,7 +225,7 @@ class Asset(OrgModelMixin): ...@@ -225,7 +225,7 @@ class Asset(OrgModelMixin):
return data return data
class Meta: class Meta:
unique_together = [('org', 'hostname'),] unique_together = [('org_id', 'hostname')]
verbose_name = _("Asset") verbose_name = _("Asset")
@classmethod @classmethod
......
...@@ -34,7 +34,7 @@ class Domain(OrgModelMixin): ...@@ -34,7 +34,7 @@ class Domain(OrgModelMixin):
return random.choice(self.gateways) return random.choice(self.gateways)
class Gateway(AssetUser, OrgModelMixin): class Gateway(AssetUser):
SSH_PROTOCOL = 'ssh' SSH_PROTOCOL = 'ssh'
RDP_PROTOCOL = 'rdp' RDP_PROTOCOL = 'rdp'
PROTOCOL_CHOICES = ( PROTOCOL_CHOICES = (
...@@ -52,4 +52,4 @@ class Gateway(AssetUser, OrgModelMixin): ...@@ -52,4 +52,4 @@ class Gateway(AssetUser, OrgModelMixin):
return self.name return self.name
class Meta: class Meta:
unique_together = [('name', 'org')] unique_together = [('name', 'org_id')]
...@@ -34,4 +34,4 @@ class Label(models.Model): ...@@ -34,4 +34,4 @@ class Label(models.Model):
class Meta: class Meta:
db_table = "assets_label" db_table = "assets_label"
unique_together = [('name', 'value'),] unique_together = [('name', 'value')]
...@@ -69,7 +69,7 @@ class AdminUser(AssetUser): ...@@ -69,7 +69,7 @@ class AdminUser(AssetUser):
class Meta: class Meta:
ordering = ['name'] ordering = ['name']
unique_together = [('name', 'org'),] unique_together = [('name', 'org_id')]
verbose_name = _("Admin user") verbose_name = _("Admin user")
@classmethod @classmethod
...@@ -157,7 +157,7 @@ class SystemUser(AssetUser): ...@@ -157,7 +157,7 @@ class SystemUser(AssetUser):
class Meta: class Meta:
ordering = ['name'] ordering = ['name']
unique_together = [('name', 'org'),] unique_together = [('name', 'org_id')]
verbose_name = _("System user") verbose_name = _("System user")
@classmethod @classmethod
......
...@@ -27,9 +27,9 @@ class OrgManager(models.Manager): ...@@ -27,9 +27,9 @@ class OrgManager(models.Manager):
if not current_org: if not current_org:
kwargs['id'] = None kwargs['id'] = None
elif current_org.is_real(): elif current_org.is_real():
kwargs['org'] = current_org kwargs['org_id'] = current_org.id
elif current_org.is_default(): elif current_org.is_default():
kwargs['org'] = None kwargs['org_id'] = None
queryset = super(OrgManager, self).get_queryset() queryset = super(OrgManager, self).get_queryset()
queryset = queryset.filter(**kwargs) queryset = queryset.filter(**kwargs)
# print(kwargs) # print(kwargs)
...@@ -53,13 +53,13 @@ class OrgManager(models.Manager): ...@@ -53,13 +53,13 @@ class OrgManager(models.Manager):
class OrgModelMixin(models.Model): class OrgModelMixin(models.Model):
org = models.ForeignKey('orgs.Organization', on_delete=models.PROTECT, null=True) org_id = models.CharField(max_length=36, null=True)
objects = OrgManager() objects = OrgManager()
def save(self, *args, **kwargs): def save(self, *args, **kwargs):
current_org = get_current_org() current_org = get_current_org()
if current_org and current_org.is_real(): if current_org and current_org.is_real():
self.org = current_org self.org_id = current_org.id
return super(OrgModelMixin, self).save(*args, **kwargs) return super(OrgModelMixin, self).save(*args, **kwargs)
class Meta: class Meta:
......
...@@ -22,7 +22,7 @@ class UserGroup(OrgModelMixin): ...@@ -22,7 +22,7 @@ class UserGroup(OrgModelMixin):
class Meta: class Meta:
ordering = ['name'] ordering = ['name']
unique_together = [('org', 'name'),] unique_together = [('org_id', 'name')]
verbose_name = _("User group") verbose_name = _("User group")
@classmethod @classmethod
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment