Merge branch 'announcement' into develop

Author: pinwheeeel

core/admin.py

@@ -266,7 +266,7 @@ class Meta:
 
 
 class AnnouncementAdmin(CustomTimeMixin, PostAdmin):
-    list_display = ["__str__", "organization", "status"]
+    list_display = ["__str__", "organization", "organization_string", "status"]
     list_filter = [OrganizationListFilter, "status"]
     ordering = ["-show_after"]
     actions = [resend_approval_email]
@@ -302,7 +302,7 @@ def get_readonly_fields(self, request, obj=None):
 
         all_fields = [
             "organization",
-            "author",
+            "organization_stringauthor",
             "title",
             "body",
             "tags",
@@ -319,6 +319,7 @@ def get_readonly_fields(self, request, obj=None):
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "title",
                     "tags",
                     "is_public",
@@ -327,6 +328,7 @@ def get_readonly_fields(self, request, obj=None):
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "title",
                     "tags",
                     "is_public",
@@ -335,6 +337,7 @@ def get_readonly_fields(self, request, obj=None):
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "title",
                     "body",
                     "tags",
@@ -346,6 +349,7 @@ def get_readonly_fields(self, request, obj=None):
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "title",
                     "body",
                     "tags",
@@ -356,18 +360,26 @@ def get_readonly_fields(self, request, obj=None):
                 },
             ],
             [
-                {"author", "organization", "supervisor"},
-                {"author", "organization", "status", "supervisor"},
+                {"author", "organization", "organization_string", "supervisor"},
+                {
+                    "author",
+                    "organization",
+                    "organization_string",
+                    "status",
+                    "supervisor",
+                },
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "status",
                     "show_after",
                     "supervisor",
                 },
                 {
                     "author",
                     "organization",
+                    "organization_string",
                     "status",
                     "supervisor",
                     "rejection_reason",
@@ -389,6 +401,7 @@ def get_readonly_fields(self, request, obj=None):
     def get_fields(self, request, obj=None):
         all_fields = [
             "organization",
+            "organization_string",
             "author",
             "title",
             "body",
@@ -424,6 +437,7 @@ def get_exclude(self, request, obj=None):
             "body",
             "tags",
             "organization",
+            "organization_string",
             "is_public",
             "supervisor",
             "status",

core/management/commands/auth_google.py

@@ -1,9 +1,10 @@
 from django.core.management.base import BaseCommand, CommandError
 from django.conf import settings
-from core.tasks import load_client
 from pathlib import Path
 import gspread
 
+from core.tasks import load_creds
+
 
 class Command(BaseCommand):
     help = "Authenticates Google Account"
@@ -14,9 +15,9 @@ def handle(self, *args, **options):
         CLIENT_PATH = SECRETS_PATH + "/client_secret.json"
         AUTHORIZED_PATH = SECRETS_PATH + "/authorized_user.json"
 
-        client, error_msg, client_path_exists = load_client()
+        creds, error_msg, client_path_exists = load_creds()
 
-        if client is None:
+        if creds is None:
             if not client_path_exists:
                 raise CommandError(error_msg)
             elif Path(AUTHORIZED_PATH).is_file():
@@ -29,7 +30,7 @@ def handle(self, *args, **options):
                 Path(AUTHORIZED_PATH).unlink()
 
             try:
-                scopes = gspread.auth.READONLY_SCOPES
+                scopes = settings.GOOGLE_SCOPES
 
                 gspread.oauth(
                     credentials_filename=CLIENT_PATH,

core/migrations/0080_alter_announcement_options_and_more.py

@@ -0,0 +1,32 @@
+# Generated by Django 5.1.13 on 2025-11-02 03:35
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0079_alter_event_name'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='announcement',
+            options={},
+        ),
+        migrations.AddField(
+            model_name='announcement',
+            name='organization_string',
+            field=models.CharField(blank=True, max_length=64, null=True),
+        ),
+        migrations.AlterField(
+            model_name='announcement',
+            name='organization',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='announcements', related_query_name='announcement', to='core.organization'),
+        ),
+        migrations.AddConstraint(
+            model_name='announcement',
+            constraint=models.CheckConstraint(condition=models.Q(('organization__isnull', False), ('organization_string__isnull', False), _connector='OR'), name='organization_or_organization_string_required'),
+        ),
+    ]

core/models/post.py

@@ -259,8 +259,12 @@ class Announcement(Post):
         on_delete=models.CASCADE,
         related_name="announcements",
         related_query_name="announcement",
+        blank=True,
+        null=True,
     )
 
+    organization_string = models.CharField(max_length=64, blank=True, null=True)
+
     is_public = models.BooleanField(
         default=True,
         help_text="Whether if this announcement pertains to the general school population, not just those in the organization.",
@@ -318,6 +322,15 @@ def approvable(self, user=None):
             return False
         return self.organization.supervisors.filter(user=user).exists()
 
+    class Meta:
+        constraints = [
+            models.CheckConstraint(
+                name="organization_or_organization_string_required",
+                check=models.Q(organization__isnull=False)
+                | models.Q(organization_string__isnull=False),
+            )
+        ]
+
 
 def featured_image_file_path_generator(instance, file_name):
     return file_upload_path_generator("featured_image")(instance, file_name)

core/static/core/css/announcement-detail.css

@@ -75,6 +75,12 @@
 .card-authors a {
     font-weight: bold;
 }
+
+.card-authors-text-string {
+    color: var(--near-black);
+    font-weight: bold;
+}
+
 hr {
     border: 0px solid var(--light-grey);
     border-top-width: 2px;

core/static/core/css/announcement-list.css

@@ -122,6 +122,12 @@
 .card-authors-text br {
     display: none;
 }
+
+.card-authors-text-string {
+    color: var(--near-black);
+    font-weight: bold;
+}
+
 .circle {
     -o-object-fit: cover;
        object-fit: cover;

core/static/core/css/index.css

@@ -191,6 +191,12 @@ hr {
     color: var(--link-colour);
     font-weight: bold;
 }
+
+.authors-text-string {
+    color: var(--near-black);
+    font-weight: bold;
+}
+
 #recent-announcements{
     padding: 2%;
 }