Fixes

Author: marcoacierno

backend/custom_admin/admin.py

@@ -60,6 +60,7 @@ def wrapper(modeladmin, request, queryset):
 def confirm_pending_status(modeladmin, request, queryset):
     queryset.update(
         status=F("pending_status"),
+        pending_status=None,
     )
 
 

backend/grants/models.py

@@ -246,9 +246,7 @@ def save(self, *args, **kwargs):
         self._original_status = self.status
 
     def _calculate_grant_amounts(self):
-        # Use pending_status if set, otherwise use current status
-        effective_status = self.pending_status if self.pending_status is not None else self.status
-        if effective_status != Grant.Status.approved:
+        if self.effective_status != Grant.Status.approved:
             return
 
         if (
@@ -331,6 +329,11 @@ def has_approved_accommodation(self):
             or self.approved_type == Grant.ApprovedType.ticket_travel_accommodation
         )
 
+    @property
+    def effective_status(self):
+        # If the grant is pending, use the pending status
+        return self.pending_status if self.pending_status is not None else self.status
+
 
 class GrantConfirmPendingStatusProxy(Grant):
     class Meta:

backend/grants/tests/test_admin.py

@@ -485,6 +485,11 @@ def test_confirm_pending_status_action(rf):
     assert grant_1.status == Grant.Status.confirmed
     assert grant_2.status == Grant.Status.waiting_list
     assert grant_3.status == Grant.Status.waiting_list_maybe
+
+    assert grant_1.pending_status is None
+    assert grant_2.pending_status is None
+    assert grant_3.pending_status is None
+
     # Left out from the action
     assert grant_4.status == Grant.Status.waiting_list_maybe
 

backend/reviews/templates/grants-recap.html

@@ -254,7 +254,7 @@
               updateBottomBarUI();
           });
 
-          waitinglistInput.addEventListener("change", () => {
+          waitinglistmaybeInput.addEventListener("change", () => {
               grantData.status = "waiting_list_maybe";
               updateBottomBarUI();
           });
@@ -469,13 +469,13 @@ <h3>
               <script>
                 grantsById[{{item.id}}] = {
                     id: {{item.id}},
-                    status: "{{ item.pending_status }}",
-                    originalStatus: "{{ item.pending_status }}",
+                    status: "{{ item.effective_status }}",
+                    originalStatus: "{{ item.effective_status }}",
                     numOfVotes: {{item.userreview_set.count}},
                 };
               </script>
               <tr
-                data-original-status="{{ item.pending_status }}"
+                data-original-status="{{ item.effective_status }}"
                 data-original-approved-type="{{ item.approved_type }}"
                 class="grant-item"
                 id="grant-{{ item.id }}"
@@ -612,7 +612,7 @@ <h3>
                     {% for status in all_review_statuses %}
                     <li>
                       <label>
-                        <input {% if item.pending_status == status.0 %}checked{% endif %}
+                        <input {% if item.effective_status == status.0 %}checked{% endif %}
                           type="radio"
                           class="status-decision-radio"
                           name="decision-{{item.id}}"
@@ -641,7 +641,7 @@ <h3>
                   {% if perms.reviews.decision_reviewsession %}
                   <ul
                     data-item-id="{{ item.id }}"
-                    class="approved-type-choices {% if item.pending_status != 'approved' %}hidden{% endif %}"
+                    class="approved-type-choices {% if item.effective_status != 'approved' %}hidden{% endif %}"
                   >
                     {% for approved_type in all_approved_types %}
                     <li>