fix: typo and naming conventions
This commit is contained in:
parent
a01a371767
commit
1325064676
4 changed files with 22 additions and 18 deletions
|
|
@ -9,7 +9,7 @@ from django.utils import timezone
|
||||||
from django.conf import settings
|
from django.conf import settings
|
||||||
|
|
||||||
# Module imports
|
# Module imports
|
||||||
from plane.license.models import Instance, EditionTypes
|
from plane.license.models import Instance, InstanceEdition
|
||||||
from plane.license.bgtasks.tracer import instance_traces
|
from plane.license.bgtasks.tracer import instance_traces
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -55,7 +55,7 @@ class Command(BaseCommand):
|
||||||
latest_version=payload.get("version"),
|
latest_version=payload.get("version"),
|
||||||
last_checked_at=timezone.now(),
|
last_checked_at=timezone.now(),
|
||||||
is_test=os.environ.get("IS_TEST", "0") == "1",
|
is_test=os.environ.get("IS_TEST", "0") == "1",
|
||||||
edition=EditionTypes.PLANE_CE.value,
|
edition=InstanceEdition.PLANE_COMMUNITY.value,
|
||||||
)
|
)
|
||||||
|
|
||||||
self.stdout.write(self.style.SUCCESS("Instance registered"))
|
self.stdout.write(self.style.SUCCESS("Instance registered"))
|
||||||
|
|
@ -69,7 +69,7 @@ class Command(BaseCommand):
|
||||||
instance.current_version = payload.get("version")
|
instance.current_version = payload.get("version")
|
||||||
instance.latest_version = payload.get("version")
|
instance.latest_version = payload.get("version")
|
||||||
instance.is_test = os.environ.get("IS_TEST", "0") == "1"
|
instance.is_test = os.environ.get("IS_TEST", "0") == "1"
|
||||||
instance.edition = EditionTypes.PLANE_CE.value
|
instance.edition = InstanceEdition.PLANE_COMMUNITY.value
|
||||||
instance.save()
|
instance.save()
|
||||||
|
|
||||||
# Call the instance traces task
|
# Call the instance traces task
|
||||||
|
|
|
||||||
|
|
@ -4,28 +4,32 @@ from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
class Migration(migrations.Migration):
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
dependencies = [
|
dependencies = [
|
||||||
('license', '0004_changelog_deleted_at_instance_deleted_at_and_more'),
|
("license", "0004_changelog_deleted_at_instance_deleted_at_and_more"),
|
||||||
]
|
]
|
||||||
|
|
||||||
operations = [
|
operations = [
|
||||||
migrations.RenameField(
|
migrations.RenameField(
|
||||||
model_name='instance',
|
model_name="instance",
|
||||||
old_name='product',
|
old_name="product",
|
||||||
new_name='edition',
|
new_name="edition",
|
||||||
),
|
),
|
||||||
migrations.RemoveField(
|
migrations.RemoveField(
|
||||||
model_name='instance',
|
model_name="instance",
|
||||||
name='license_key',
|
name="license_key",
|
||||||
),
|
),
|
||||||
migrations.RemoveField(
|
migrations.RemoveField(
|
||||||
model_name='instance',
|
model_name="instance",
|
||||||
name='user_count',
|
name="user_count",
|
||||||
),
|
),
|
||||||
migrations.AddField(
|
migrations.AddField(
|
||||||
model_name='instance',
|
model_name="instance",
|
||||||
name='is_test',
|
name="is_test",
|
||||||
field=models.BooleanField(default=False),
|
field=models.BooleanField(default=False),
|
||||||
),
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="instance",
|
||||||
|
name="edition",
|
||||||
|
field=models.CharField(default="PLANE_COMMUNITY", max_length=255),
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|
|
||||||
|
|
@ -2,5 +2,5 @@ from .instance import (
|
||||||
Instance,
|
Instance,
|
||||||
InstanceAdmin,
|
InstanceAdmin,
|
||||||
InstanceConfiguration,
|
InstanceConfiguration,
|
||||||
EditionTypes,
|
InstanceEdition,
|
||||||
)
|
)
|
||||||
|
|
|
||||||
|
|
@ -11,8 +11,8 @@ from plane.db.models import BaseModel
|
||||||
ROLE_CHOICES = ((20, "Admin"),)
|
ROLE_CHOICES = ((20, "Admin"),)
|
||||||
|
|
||||||
|
|
||||||
class EditionTypes(Enum):
|
class InstanceEdition(Enum):
|
||||||
PLANE_CE = "plane-ce"
|
PLANE_COMMUNITY = "PLANE_COMMUNITY"
|
||||||
|
|
||||||
|
|
||||||
class Instance(BaseModel):
|
class Instance(BaseModel):
|
||||||
|
|
@ -23,7 +23,7 @@ class Instance(BaseModel):
|
||||||
current_version = models.CharField(max_length=255)
|
current_version = models.CharField(max_length=255)
|
||||||
latest_version = models.CharField(max_length=255, null=True, blank=True)
|
latest_version = models.CharField(max_length=255, null=True, blank=True)
|
||||||
edition = models.CharField(
|
edition = models.CharField(
|
||||||
max_length=255, default=EditionTypes.PLANE_CE.value
|
max_length=255, default=InstanceEdition.PLANE_COMMUNITY.value
|
||||||
)
|
)
|
||||||
domain = models.TextField(blank=True)
|
domain = models.TextField(blank=True)
|
||||||
# Instance specifics
|
# Instance specifics
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue