From 2fb1a3d0d1541c8f15098d652f519c0337f19eab Mon Sep 17 00:00:00 2001 From: realaravinth Date: Sat, 18 Jun 2022 21:54:53 +0530 Subject: [PATCH] fix: one user can have multiple instances; OneToOneField -> ForeignKey --- .../0005_alter_instance_owned_by.py | 23 +++++++++++++++++++ dash/models.py | 2 +- dashboard/settings.py | 5 +++- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 dash/migrations/0005_alter_instance_owned_by.py diff --git a/dash/migrations/0005_alter_instance_owned_by.py b/dash/migrations/0005_alter_instance_owned_by.py new file mode 100644 index 0000000..120e7e9 --- /dev/null +++ b/dash/migrations/0005_alter_instance_owned_by.py @@ -0,0 +1,23 @@ +# Generated by Django 4.0.3 on 2022-06-18 15:11 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ("dash", "0004_instanceconfiguration_rent"), + ] + + operations = [ + migrations.AlterField( + model_name="instance", + name="owned_by", + field=models.ForeignKey( + on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL + ), + ), + ] diff --git a/dash/models.py b/dash/models.py index f486a34..70c32b0 100644 --- a/dash/models.py +++ b/dash/models.py @@ -77,7 +77,7 @@ class Instance(models.Model): Hostea instances """ - owned_by = models.OneToOneField(User, on_delete=models.CASCADE) + owned_by = models.ForeignKey(User, on_delete=models.CASCADE) ID = models.AutoField(primary_key=True) name = models.CharField( "Name of this Instance. Also Serves as subdomain", diff --git a/dashboard/settings.py b/dashboard/settings.py index 2444308..ed9593f 100644 --- a/dashboard/settings.py +++ b/dashboard/settings.py @@ -136,7 +136,10 @@ DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField" HOSTEA = { "RESTRICT_NEW_INTEGRATION_INSTALLATION": True, "INSTANCE_MAINTAINER_CONTACT": "contact@hostea.example.org", - "ACCOUNTS": {"MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24}, # in seconds + "ACCOUNTS": { + "MAX_VERIFICATION_TOLERANCE_PERIOD": 60 * 60 * 24, # in seconds + "SUDO_TTL": 60 * 5, + }, "META": { "GITEA_INSTANCE": "https://gitea.hostea.org", # meta Gitea insatnce "GITEA_ORG_NAME": "Hostea", # Organisation name on Hostea meta instance