Merge branch 'announcement-fix' into develop

Author: pinwheeeel

core/admin.py

@@ -302,7 +302,8 @@ def get_readonly_fields(self, request, obj=None):
 
         all_fields = [
             "organization",
-            "organization_stringauthor",
+            "organization_string",
+            "author",
             "title",
             "body",
             "tags",

core/api/v3/objects/announcement.py

@@ -96,6 +96,7 @@ class Meta:
             "rejection_reason",
             "author",
             "organization",
+            "organization_string",
             "supervisor",
             "tags",
             "likes",

core/models/post.py

@@ -291,7 +291,7 @@ def get_absolute_url(self):
 
     @classmethod
     def get_approved(cls) -> QuerySet:
-        return cls.objects.filter(status="a").filter(show_after__lte=timezone.now())
+        return cls.objects.filter(status="a").filter(show_after__lte=timezone.now()).order_by("-show_after")
 
     @classmethod
     def get_all(cls, user=None) -> QuerySet:

core/tasks.py

@@ -86,7 +86,7 @@ def delete_expired_users():
     """Scrub user data from inactive accounts that have not logged in for 14 days. (marked deleted)"""
     queryset = User.objects.filter(
         is_deleted=True,
-        last_login__lt=dt.datetime.now() - dt.timedelta(days=14),
+        last_login__lt=timezone.make_aware(dt.datetime.now() - dt.timedelta(days=14)),
     )
     comments = Comment.objects.filter(author__in=queryset)
     comments.update(
@@ -97,7 +97,7 @@ def delete_expired_users():
         last_name="User",
         username=get_random_username(),
         bio="",
-        timezone="",
+        # timezone="",
         graduating_year=None,
         is_teacher=False,
         organizations=[],

core/templates/core/announcement/card_snippet.html

@@ -20,9 +20,7 @@ <h1 class="title">{{ announcement.title }}</h1>
             {% endif %}
             <div class="card-authors-text">
                 {% if announcement.organization %}
-                    {{ announcement.organization.slug|organization }}
-                {% else %}
-                    <span class="card-authors-text-string">{{ announcement.organization_string }}</span>{% endif %}{% if announcement.author %}, {{ announcement.author.username|user }}
+                    {{ announcement.organization.slug|organization }}{% else %}<span class="card-authors-text-string">{{ announcement.organization_string }}</span>{% endif %}{% if announcement.author %}, {{ announcement.author.username|user }}
                 {% endif %}
                 <br>
                 <dot>•</dot> {{ announcement.created_date|date:"M. j, Y" }}{{ announcement.created_date|date:", g:i A"|lower }}

core/templates/core/announcement/detail.html

@@ -48,9 +48,7 @@ <h1 class="title">{{ announcement.title }}</h1>
                 {% endif %}
                 <div class="card-authors-text">
                     {% if announcement.organization %}
-                        {{ announcement.organization.slug|organization }},
-                    {% else %}
-                        <span class="card-authors-text-string">{{ announcement.organization_string }}</span>{% endif %}{% if announcement.author %}, {{ announcement.author.username|user }}
+                        {{ announcement.organization.slug|organization }}{% else %}<span class="card-authors-text-string">{{ announcement.organization_string }}</span>{% endif %}{% if announcement.author %}, {{ announcement.author.username|user }}
                     {% endif %}
                     <br>
                     <dot>•</dot> {{ announcement.last_modified_date }}