Merge pull request #16031 from craftcms/bugfix/16029-graphql-tokens-l…

…isting-page-expiry-date show token expiry date (if set) on all tokens page
craftcms · Nov 7, 2024 · 9137273 · 9137273
2 parents 26c3987 + e7642da
commit 9137273
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - Fixed a bug where entry/category drafts weren’t retaining new parent selections.
 - Fixed a bug where the “Related To” condition rule would lose track of the selected element if it belonged to a different site. ([#16005](https://github.com/craftcms/cms/pull/16005))
+- Fixed a bug where the GraphQL tokens index was saying tokens never expired. ([#16029](https://github.com/craftcms/cms/issues/16029))
 - Fixed styling issues. ([#15965](https://github.com/craftcms/cms/issues/15965))
 
 ## 4.12.8 - 2024-10-22

diff --git a/src/templates/graphql/tokens/_index.twig b/src/templates/graphql/tokens/_index.twig
@@ -29,7 +29,7 @@
         url: url('graphql/tokens/' ~ token.id),
         status: token.enabled ? true : false,
         lastUsed: { value: token.lastUsed , date: token.lastUsed ? token.lastUsed|timestamp : null },
-        expiryDate: token.expiryDate ? token.expiryDate|timestamp : 'Never'|t()
+        expiryDate: { value: token.expiryDate, date: token.expiryDate ? token.expiryDate|timestamp : null }
     }]) %}
 {% endfor %}