Merge pull request #519 from ColonelThirtyTwo/fix-activity-type-blank

Fix cloud servers activity type + server role being optional on the form

ghostwriter/shepherd/migrations/0050_auto_20240917_1521.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.19 on 2024-09-17 15:21
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('shepherd', '0049_set_text_defaults'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='transientserver',
+            name='activity_type',
+            field=models.ForeignKey(help_text='Select how this VPS will be used', on_delete=django.db.models.deletion.PROTECT, to='shepherd.activitytype'),
+        ),
+        migrations.AlterField(
+            model_name='transientserver',
+            name='server_role',
+            field=models.ForeignKey(help_text='Select the role this VPS will play', on_delete=django.db.models.deletion.PROTECT, to='shepherd.serverrole'),
+        ),
+    ]

ghostwriter/shepherd/models.py

@@ -638,14 +638,12 @@ class TransientServer(models.Model):
         "ServerRole",
         on_delete=models.PROTECT,
         null=False,
-        blank=True,
         help_text="Select the role this VPS will play",
     )
     activity_type = models.ForeignKey(
         "ActivityType",
         on_delete=models.PROTECT,
         null=False,
-        blank=True,
         help_text="Select how this VPS will be used",
     )