From bf464db61baa0b84ad510562ae650d5ab1aa05ef Mon Sep 17 00:00:00 2001
From: sujal <sujalshah28092004@gmail.com>
Date: Fri, 23 Feb 2024 16:52:48 +0530
Subject: [PATCH] setting_ui: Fix sorting by "Expires at" column.

Previously, the sorting was broken due to
incorrect referencing of the property.
The code has been updated to use the "expiry_date"
property instead of "expires_at".

Fixes #29005.
---
 web/src/settings_invites.ts                   | 2 +-
 web/templates/settings/invites_list_admin.hbs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/web/src/settings_invites.ts b/web/src/settings_invites.ts
index 3763bd4dba..085a966644 100644
--- a/web/src/settings_invites.ts
+++ b/web/src/settings_invites.ts
@@ -127,7 +127,7 @@ function populate_invites(invites_data: {invites: Invite[]}): void {
             ...ListWidget.generic_sort_functions("alphabetic", ["ref"]),
             ...ListWidget.generic_sort_functions("numeric", [
                 "invited",
-                "expires_at",
+                "expiry_date",
                 "invited_as",
             ]),
         },
diff --git a/web/templates/settings/invites_list_admin.hbs b/web/templates/settings/invites_list_admin.hbs
index 11726cee56..455ff17fd3 100644
--- a/web/templates/settings/invites_list_admin.hbs
+++ b/web/templates/settings/invites_list_admin.hbs
@@ -19,7 +19,7 @@
                 <th data-sort="alphabetic" data-sort-prop="ref">{{t "Invited by" }}</th>
                 {{/if}}
                 <th data-sort="numeric" data-sort-prop="invited">{{t "Invited at" }}</th>
-                <th data-sort="numeric" data-sort-prop="expires_at">{{t "Expires at" }}</th>
+                <th data-sort="numeric" data-sort-prop="expiry_date">{{t "Expires at" }}</th>
                 <th data-sort="numeric" data-sort-prop="invited_as">{{t "Invited as" }}</th>
                 <th class="actions">{{t "Actions" }}</th>
             </thead>