diff --git a/panel/src/panel/admin.py b/panel/src/panel/admin.py index 1206f52b..3c70e905 100644 --- a/panel/src/panel/admin.py +++ b/panel/src/panel/admin.py @@ -1,4 +1,4 @@ from django.contrib import admin -from .models import DeployFormModel +from panel.models import Configuration -admin.site.register(DeployFormModel) +admin.site.register(Configuration) diff --git a/panel/src/panel/forms.py b/panel/src/panel/forms.py index c898f83b..4f66229b 100644 --- a/panel/src/panel/forms.py +++ b/panel/src/panel/forms.py @@ -1,10 +1,10 @@ from django import forms -from .models import DeployFormModel +from panel.models import Configuration -class DeployForm(forms.ModelForm): +class Deployment(forms.ModelForm): class Meta: - model = DeployFormModel + model = Configuration fields = [ 'domain', 'mastodon', diff --git a/panel/src/panel/migrations/0003_renamemodel.py b/panel/src/panel/migrations/0003_renamemodel.py new file mode 100644 index 00000000..5a5fec21 --- /dev/null +++ b/panel/src/panel/migrations/0003_renamemodel.py @@ -0,0 +1,18 @@ +# Generated by Django 4.2.16 on 2025-02-20 09:20 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + dependencies = [ + ('panel', '0002_deployformmodel_user'), + ] + + operations = [ + migrations.RenameModel( + old_name='DeployFormModel', + new_name='Configuration', + ), + ] diff --git a/panel/src/panel/models.py b/panel/src/panel/models.py index 17672cf4..f1be7272 100644 --- a/panel/src/panel/models.py +++ b/panel/src/panel/models.py @@ -4,7 +4,7 @@ from django.contrib.auth.models import User DOMAIN_LIST = [("fediversity_eu", "fediversity.eu"), ("fediversity_net", "fediversity.net")] -class DeployFormModel(models.Model): +class Configuration(models.Model): user = models.ForeignKey(User, on_delete=models.CASCADE, default=1) domain = models.CharField(choices=DOMAIN_LIST, max_length=255) mastodon = models.BooleanField(default=False) diff --git a/panel/src/panel/views.py b/panel/src/panel/views.py index 1e5ad15e..a6e7824b 100644 --- a/panel/src/panel/views.py +++ b/panel/src/panel/views.py @@ -5,8 +5,8 @@ from django.views.generic import DetailView from django.views.generic.edit import UpdateView from django.shortcuts import get_object_or_404 from django.urls import reverse_lazy -from .models import DeployFormModel -from .forms import DeployForm +from panel.models import Configuration +from panel import forms class Index(TemplateView): @@ -27,11 +27,11 @@ class ServiceList(TemplateView): class DeployServices(LoginRequiredMixin, UpdateView): template_name = 'deploy_services.html' - model = DeployFormModel - form_class = DeployForm + model = Configuration + form_class = forms.Deployment success_url = reverse_lazy('deploy_services') def get_object(self, queryset=None): - obj, created = DeployFormModel.objects.get_or_create( + obj, created = Configuration.objects.get_or_create( user=self.request.user) return obj