uploading files to different folders

organizer admin nicer

Author: benabraham

Diff for: docker-compose.yaml

@@ -32,7 +32,7 @@ services:
   # Should be run as one-off tool, does not start automatically because of the profile entry.
   og_generator:
     profiles: ["tools"]
-    command: bash -c "rm -rf data/mediafiles/og-images && cp static/generated/index.css templates && python3 manage.py program_generate_og_images && rm templates/index.css"
+    command: bash -c "rm -rf data/mediafiles/og-images/talks data/mediafiles/og-images/workshops && cp static/generated/index.css templates && python3 manage.py program_generate_og_images && rm templates/index.css"
     build:
       context: .
       dockerfile: og-generator.dockerfile

Diff for: program/migrations/0014_alter_speaker_github_alter_speaker_linkedin_and_more.py

@@ -0,0 +1,52 @@
+# Generated by Django 4.2.1 on 2023-08-23 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("program", "0013_alter_speaker_options_alter_speaker_order_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="speaker",
+            name="github",
+            field=models.URLField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="speaker",
+            name="linkedin",
+            field=models.URLField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="speaker",
+            name="personal_website",
+            field=models.URLField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="speaker",
+            name="twitter",
+            field=models.URLField(blank=True, max_length=255),
+        ),
+        migrations.AlterField(
+            model_name="talk",
+            name="og_image",
+            field=models.ImageField(
+                blank=True,
+                help_text="og:image (social media image) 1200×630 pixels",
+                null=True,
+                upload_to="og-images/program/",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="workshop",
+            name="og_image",
+            field=models.ImageField(
+                blank=True,
+                help_text="og:image (social media image) 1200×630 pixels",
+                null=True,
+                upload_to="og-images/program/",
+            ),
+        ),
+    ]

Diff for: program/models.py

@@ -21,10 +21,10 @@ class Meta:
     full_name = models.CharField(max_length=200)
     bio = models.TextField()
     short_bio = models.TextField(blank=True, help_text="for keynote speakers")
-    twitter = models.CharField(max_length=255, blank=True)
-    github = models.CharField(max_length=255, blank=True)
-    linkedin = models.CharField(max_length=255, blank=True)
-    personal_website = models.CharField(max_length=255, blank=True)
+    twitter = models.URLField(max_length=255, blank=True)
+    github = models.URLField(max_length=255, blank=True)
+    linkedin = models.URLField(max_length=255, blank=True)
+    personal_website = models.URLField(max_length=255, blank=True)
     email = models.EmailField()
     photo = models.ImageField(null=True, blank=True)
     talks = models.ManyToManyField("Talk", blank=True, related_name="talk_speakers")
@@ -154,6 +154,7 @@ class Meta:
         null=True,
         blank=True,
         help_text="og:image (social media image) 1200×630 pixels",
+        upload_to="og-images/program/"
     )
     pretalx_code = models.CharField(
         max_length=16, null=True, blank=True, unique=True

Diff for: sponsors/migrations/0008_alter_sponsor_logo.py

@@ -0,0 +1,19 @@
+# Generated by Django 4.2.1 on 2023-08-23 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("sponsors", "0007_alter_level_options_alter_level_order_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="sponsor",
+            name="logo",
+            field=models.FileField(
+                blank=True, help_text="SVG only", null=True, upload_to="sponsors/"
+            ),
+        ),
+    ]

Diff for: sponsors/models.py

@@ -25,7 +25,7 @@ class Sponsor(models.Model):
     level = models.ForeignKey(Level, on_delete=models.SET_NULL, null=True)
 
     name = models.CharField(max_length=200, unique=True)
-    logo = models.FileField(null=True, blank=True, help_text="SVG only")
+    logo = models.FileField(null=True, blank=True, help_text="SVG only", upload_to="sponsors/")
 
     description = models.TextField(
         null=True, blank=True, help_text="markdown formatted"

Diff for: team/admin.py

@@ -2,4 +2,18 @@
 
 from .models import Organizer
 
-admin.site.register(Organizer)
+
+class OrganizerAdmin(admin.ModelAdmin):
+    list_display = [
+        "full_name",
+        "published",
+    ]
+    list_editable = [
+        "published",
+    ]
+    list_filter = [
+        "published",
+    ]
+
+
+admin.site.register(Organizer, OrganizerAdmin)

Diff for: team/migrations/0003_organizer_linkedin_alter_organizer_github_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 4.2.1 on 2023-08-23 21:10
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("team", "0002_teampage_alter_organizer_email_alter_organizer_photo"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="organizer",
+            name="linkedin",
+            field=models.URLField(blank=True, help_text="full URL", null=True),
+        ),
+        migrations.AlterField(
+            model_name="organizer",
+            name="github",
+            field=models.URLField(blank=True, help_text="full URL", null=True),
+        ),
+        migrations.AlterField(
+            model_name="organizer",
+            name="photo",
+            field=models.ImageField(upload_to="organizers/"),
+        ),
+        migrations.AlterField(
+            model_name="organizer",
+            name="twitter",
+            field=models.URLField(blank=True, help_text="full URL", null=True),
+        ),
+    ]

Diff for: team/models.py

@@ -9,9 +9,10 @@
 class Organizer(models.Model):
     full_name = models.CharField(max_length=200)
     email = models.EmailField(default="", blank=True, help_text="private field")
-    twitter = models.CharField(max_length=255, blank=True, help_text="handle without @")
-    github = models.CharField(max_length=255, blank=True, help_text="handle only")
-    photo = models.ImageField()
+    twitter = models.URLField(null=True, blank=True, help_text="full URL")
+    github = models.URLField(null=True, blank=True, help_text="full URL")
+    linkedin = models.URLField(null=True, blank=True, help_text="full URL")
+    photo = models.ImageField(upload_to="organizers/")
     published = models.BooleanField(default=False)