From f38de18e3d421ba453df4ff0ad10df568d6a6606 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 27 Aug 2024 09:45:57 +0200 Subject: [PATCH 1/2] Order invoice table on project page by date, newest on top. (#4097) --- hypha/apply/projects/models/payment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hypha/apply/projects/models/payment.py b/hypha/apply/projects/models/payment.py index c96cccf887..e7e92709e8 100644 --- a/hypha/apply/projects/models/payment.py +++ b/hypha/apply/projects/models/payment.py @@ -119,10 +119,10 @@ def for_finance_2(self): return [] def rejected(self): - return self.filter(status=DECLINED) + return self.filter(status=DECLINED).order_by("-requested_at") def not_rejected(self): - return self.exclude(status=DECLINED) + return self.exclude(status=DECLINED).order_by("-requested_at") def total_value(self, field): return self.aggregate( From 7b5079b303f8b3772e956270bef01d33a00611b0 Mon Sep 17 00:00:00 2001 From: Fredrik Jonsson Date: Tue, 27 Aug 2024 10:37:09 +0200 Subject: [PATCH 2/2] Add a gap between review buttons for staff. (#4113) --- .../templates/funds/applicationsubmission_admin_detail.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html index 90f1bdbc5d..9716487011 100644 --- a/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html +++ b/hypha/apply/funds/templates/funds/applicationsubmission_admin_detail.html @@ -33,7 +33,7 @@
{% trans "Reviews & assignees" %}
-
+
{% include 'review/includes/review_button.html' with submission=object class="button--half-width" %} {% if request.user.is_apply_staff and object.reviews.exists %} {% trans "View all" %}