fixes

Author: marcoacierno

backend/custom_admin/admin.py

@@ -1,3 +1,4 @@
+from django.db.models import F
 from django.contrib import messages
 from functools import wraps
 
@@ -52,3 +53,19 @@ def wrapper(modeladmin, request, queryset):
         return func(modeladmin, request, queryset)
 
     return wrapper
+
+
+@admin.action(description="Confirm pending status change")
+@validate_single_conference_selection
+def confirm_pending_status(modeladmin, request, queryset):
+    queryset.update(
+        status=F("pending_status"),
+    )
+
+
+@admin.action(description="Reset pending status to status")
+@validate_single_conference_selection
+def reset_pending_status_back_to_status(modeladmin, request, queryset):
+    queryset.update(
+        pending_status=F("status"),
+    )

backend/grants/admin.py

@@ -5,7 +5,11 @@
 )
 from conferences.models.conference_voucher import ConferenceVoucher
 from pycon.constants import UTC
-from custom_admin.admin import validate_single_conference_selection
+from custom_admin.admin import (
+    confirm_pending_status,
+    reset_pending_status_back_to_status,
+    validate_single_conference_selection,
+)
 from import_export.resources import ModelResource
 from datetime import timedelta
 from typing import Dict, List, Optional
@@ -579,22 +583,6 @@ class Media:
         js = ["admin/js/jquery.init.js"]
 
 
-@admin.action(description="Confirm pending status change")
-@validate_single_conference_selection
-def confirm_pending_status(modeladmin, request, queryset):
-    Grant.objects.filter(id__in=queryset.values_list("id", flat=True)).update(
-        status=F("pending_status"),
-    )
-
-
-@admin.action(description="Reset pending status")
-@validate_single_conference_selection
-def reset_pending_status_back_to_status(modeladmin, request, queryset):
-    Grant.objects.filter(id__in=queryset.values_list("id", flat=True)).update(
-        pending_status=F("status"),
-    )
-
-
 @admin.register(GrantConfirmPendingStatusProxy)
 class GrantConfirmPendingStatusProxyAdmin(admin.ModelAdmin):
     list_display = (

backend/grants/tests/test_admin.py

@@ -466,16 +466,27 @@ def test_confirm_pending_status_action(rf):
         conference=grant_1.conference,
     )
 
+    grant_4 = GrantFactory(
+        status=Grant.Status.waiting_list_maybe,
+        pending_status=Grant.Status.confirmed,
+        conference=grant_1.conference,
+    )
+
     request = rf.get("/")
-    confirm_pending_status(None, request, Grant.objects.all())
+    confirm_pending_status(
+        None, request, Grant.objects.filter(id__in=[grant_1.id, grant_2.id, grant_3.id])
+    )
 
     grant_1.refresh_from_db()
     grant_2.refresh_from_db()
     grant_3.refresh_from_db()
+    grant_4.refresh_from_db()
 
     assert grant_1.status == Grant.Status.confirmed
     assert grant_2.status == Grant.Status.waiting_list
     assert grant_3.status == Grant.Status.waiting_list_maybe
+    # Left out from the action
+    assert grant_4.status == Grant.Status.waiting_list_maybe
 
 
 def test_reset_pending_status_back_to_status_action(rf):
@@ -496,13 +507,31 @@ def test_reset_pending_status_back_to_status_action(rf):
         conference=grant_1.conference,
     )
 
+    grant_4 = GrantFactory(
+        status=Grant.Status.waiting_list_maybe,
+        pending_status=Grant.Status.confirmed,
+        conference=grant_1.conference,
+    )
+
     request = rf.get("/")
-    reset_pending_status_back_to_status(None, request, Grant.objects.all())
+    reset_pending_status_back_to_status(
+        None, request, Grant.objects.filter(id__in=[grant_1.id, grant_2.id, grant_3.id])
+    )
 
     grant_1.refresh_from_db()
     grant_2.refresh_from_db()
     grant_3.refresh_from_db()
+    grant_4.refresh_from_db()
 
     assert grant_1.status == Grant.Status.pending
+    assert grant_1.pending_status == Grant.Status.pending
+
     assert grant_2.status == Grant.Status.rejected
+    assert grant_2.pending_status == Grant.Status.rejected
+
     assert grant_3.status == Grant.Status.waiting_list
+    assert grant_3.pending_status == Grant.Status.waiting_list
+
+    # Left out from the action
+    assert grant_4.status == Grant.Status.waiting_list_maybe
+    assert grant_4.pending_status == Grant.Status.confirmed

backend/reviews/templates/proposals-recap.html

@@ -401,7 +401,7 @@ <h3>Show proposals with pending status:</h3>
                   numOfVotes: {{item.userreview_set.count}},
                 };
               </script>
-              <tr class="proposal-item" id="submission-{{item.id}}" data-original-status="{{ item.status }}">
+              <tr class="proposal-item" id="submission-{{item.id}}" data-original-status="{{ item.pending_status }}">
                 <td>{{forloop.counter}}</td>
                 <td class="results-title">
                   <a
@@ -496,7 +496,7 @@ <h3>Show proposals with pending status:</h3>
                 <td class="decision-input-wrapper">
                   <label>
                     <input
-                      {% if item.status == 'accepted' %}checked{% endif %}
+                      {% if item.pending_status == 'accepted' %}checked{% endif %}
                       type="radio"
                       name="decision-{{item.id}}"
                       value="accepted"
@@ -505,7 +505,7 @@ <h3>Show proposals with pending status:</h3>
                   </label>
                   <label>
                     <input
-                      {% if item.status == 'rejected' %}checked{% endif %}
+                      {% if item.pending_status == 'rejected' %}checked{% endif %}
                       type="radio"
                       name="decision-{{item.id}}"
                       value="rejected"
@@ -514,7 +514,7 @@ <h3>Show proposals with pending status:</h3>
                   </label>
                   <label>
                     <input
-                      {% if item.status == 'waiting_list' %}checked{% endif %}
+                      {% if item.pending_status == 'waiting_list' %}checked{% endif %}
                       type="radio"
                       name="decision-{{item.id}}"
                       value="waiting_list"

backend/submissions/admin.py

@@ -1,7 +1,13 @@
-from custom_admin.admin import validate_single_conference_selection
+from django.urls import reverse
+from custom_admin.admin import (
+    confirm_pending_status,
+    reset_pending_status_back_to_status,
+    validate_single_conference_selection,
+)
 from import_export.resources import ModelResource
 
 from django import forms
+from django.db.models import F
 from django.contrib import admin, messages
 from django.utils.html import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -316,4 +322,48 @@ class SubmissionCommentAdmin(admin.ModelAdmin):
 
 @admin.register(SubmissionConfirmPendingStatusProxy)
 class SubmissionConfirmPendingStatusProxyAdmin(admin.ModelAdmin):
-    ...
+    list_display = (
+        "id",
+        "title",
+        "speaker_name",
+        "status",
+        "to",
+        "pending_status",
+        "open_submission",
+        "conference",
+    )
+    list_filter = ("status", "pending_status", "conference")
+    search_fields = ("speaker__full_name", "speaker__email", "title")
+    list_display_links = None
+    actions = [
+        confirm_pending_status,
+        reset_pending_status_back_to_status,
+    ]
+
+    def speaker_name(self, obj):
+        return obj.speaker.display_name
+
+    def to(self, obj):
+        return "➡️"
+
+    def has_delete_permission(self, request, obj=None):
+        return False
+
+    def has_add_permission(self, request):
+        return False
+
+    def has_change_permission(self, request, obj=None):
+        return False
+
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .exclude(
+                pending_status=F("status"),
+            )
+        )
+
+    def open_submission(self, obj):
+        url = reverse("admin:submissions_submission_change", args=[obj.id])
+        return mark_safe(f'<a href="{url}">Open Submission</a>')