Merge branch 'main' into fix-social-card-links

Author: marcoacierno

.github/workflows/backend-checks.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   check-migrations:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: backend

.github/workflows/backend-test.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   unit-tests:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: backend

.github/workflows/deploy.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   create-db:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./infrastructure/applications
@@ -195,7 +195,7 @@ jobs:
           platforms: linux/arm64
 
   terraform:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-and-push-arm-service, build-pretix, create-db]
     environment:
       name: ${{ fromJSON('["pastaporto", "production"]')[github.ref == 'refs/heads/main'] }}
@@ -229,7 +229,7 @@ jobs:
           AWS_DEFAULT_REGION: eu-central-1
 
   wait-aws-update:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [terraform]
     steps:
       - name: Check health status
@@ -274,7 +274,7 @@ jobs:
         id: image
         run: |
           set +e
-          aws ecr describe-images --repository-name=pythonit/pycon-frontend --image-ids=imageTag=${{ steps.git.outputs.githash }}
+          aws ecr describe-images --repository-name=pythonit/${{ fromJSON('["pastaporto", "production"]')[github.ref == 'refs/heads/main'] }}-pycon-frontend --image-ids=imageTag=${{ steps.git.outputs.githash }}
           if [[ $? == 0 ]]; then
             echo "image_exists=1" >> $GITHUB_OUTPUT
           else
@@ -315,7 +315,7 @@ jobs:
           builder: ${{ steps.buildx.outputs.name }}
           provenance: false
           push: true
-          tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/pycon-frontend:${{ steps.git.outputs.githash }}
+          tags: ${{ secrets.AWS_ACCOUNT_ID }}.dkr.ecr.eu-central-1.amazonaws.com/pythonit/${{ fromJSON('["pastaporto", "production"]')[github.ref == 'refs/heads/main'] }}-pycon-frontend:${{ steps.git.outputs.githash }}
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
           platforms: linux/arm64
@@ -325,9 +325,10 @@ jobs:
             CMS_ADMIN_HOST=${{ fromJSON('["pastaporto-", ""]')[github.ref == 'refs/heads/main'] }}admin.pycon.it
             CMS_HOSTNAME=${{ steps.vars.outputs.cms_hostname }}
             CONFERENCE_CODE=${{ steps.vars.outputs.conference_code }}
+            GIT_HASH=${{ steps.git.outputs.githash }}
 
   deploy-fe:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     needs: [build-fe]
     environment:
       name: ${{ fromJSON('["pastaporto", "production"]')[github.ref == 'refs/heads/main'] }}

.github/workflows/frontend-lint.yml

@@ -10,7 +10,7 @@ on:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./frontend

.github/workflows/global-terraform-deploy.yml

@@ -13,7 +13,7 @@ env:
 
 jobs:
   apply-changes:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./infrastructure/global

.github/workflows/global-terraform-lint.yml

@@ -11,7 +11,7 @@ env:
 
 jobs:
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4

.github/workflows/slash-commands.yml

@@ -6,7 +6,7 @@ on:
 
 jobs:
   slash-command-dispatch:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - uses: actions/github-script@v3
         id: get-pr

.github/workflows/terminate-staging-env.yml

@@ -10,7 +10,7 @@ env:
 
 jobs:
   terminate-env:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     defaults:
       run:
         working-directory: ./infrastructure/applications

.github/workflows/terraform-lint.yml

@@ -12,7 +12,7 @@ env:
 jobs:
   tfsec:
     name: TFSec
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     permissions:
       contents: read
@@ -27,7 +27,7 @@ jobs:
           github_token: ${{ github.token }}
 
   lint:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
 
     steps:
       - uses: actions/checkout@v4

backend/grants/admin.py

@@ -10,7 +10,6 @@
 from datetime import timedelta
 from typing import Dict, List, Optional
 from countries.filters import CountryFilter
-from django import forms
 from django.contrib import admin, messages
 from django.db.models.query import QuerySet
 from django.utils import timezone
@@ -30,6 +29,7 @@
 from django.db.models import Exists, OuterRef
 
 from django.contrib.admin import SimpleListFilter
+from participants.models import Participant
 
 EXPORT_GRANTS_FIELDS = (
     "name",
@@ -351,39 +351,6 @@ def mark_rejected_and_send_email(modeladmin, request, queryset):
         messages.info(request, f"Sent Rejected reply email to {grant.name}")
 
 
-class GrantAdminForm(forms.ModelForm):
-    class Meta:
-        model = Grant
-        fields = (
-            "id",
-            "name",
-            "status",
-            "approved_type",
-            "ticket_amount",
-            "travel_amount",
-            "accommodation_amount",
-            "total_amount",
-            "full_name",
-            "conference",
-            "user",
-            "age_group",
-            "gender",
-            "occupation",
-            "grant_type",
-            "python_usage",
-            "been_to_other_events",
-            "needs_funds_for_travel",
-            "why",
-            "notes",
-            "nationality",
-            "departure_country",
-            "departure_city",
-            "country_type",
-            "applicant_reply_sent_at",
-            "applicant_reply_deadline",
-        )
-
-
 class IsProposedSpeakerFilter(SimpleListFilter):
     title = "Is Proposed Speaker"
     parameter_name = "is_proposed_speaker"
@@ -420,7 +387,6 @@ def queryset(self, request, queryset):
 class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
     change_list_template = "admin/grants/grant/change_list.html"
     resource_class = GrantResource
-    form = GrantAdminForm
     list_display = (
         "user_display_name",
         "country",
@@ -524,16 +490,27 @@ class GrantAdmin(ExportMixin, ConferencePermissionMixin, admin.ModelAdmin):
                     "been_to_other_events",
                     "community_contribution",
                     "notes",
-                    "website",
-                    "twitter_handle",
-                    "github_handle",
-                    "linkedin_url",
-                    "mastodon_handle",
                 )
             },
         ),
     )
 
+    def change_view(self, request, object_id, form_url="", extra_context=None):
+        extra_context = extra_context or {}
+        grant = self.model.objects.get(id=object_id)
+        owner_id = grant.user_id
+        extra_context["participant"] = Participant.objects.filter(
+            user_id=owner_id,
+            conference_id=grant.conference_id,
+        ).first()
+
+        return super().change_view(
+            request,
+            object_id,
+            form_url,
+            extra_context=extra_context,
+        )
+
     @admin.display(description="User", ordering="user__full_name")
     def user_display_name(self, obj):
         if obj.user_id: