From a18d7a473554f293e3c1c8519878bc57f75c0563 Mon Sep 17 00:00:00 2001
From: Josh Yu <joshyu@users.noreply.github.com>
Date: Fri, 31 May 2024 20:13:59 +0800
Subject: [PATCH] fix: link with class `related-widget-wrapper-link` should pop
 up (#4)

Co-authored-by: Josh Yu <joshyu@foxmail.com>
---
 CHANGELOG.rst                                                   | 2 ++
 .../admin/icons/additional_content_settings_icon.html           | 2 +-
 .../templates/djangocms_content_expiry/calendar_icon.html       | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 35e2736..4bcd025 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -4,6 +4,8 @@ Changelog
 
 unreleased
 ==========
+* fix: add `data-popup="yes"` to the link with class `related-widget-wrapper-link`, then the popup will be shown when the user clicks on the link. 
+  The JS logic got changed after Django 4.1 upgrade (#15301)
 
 1.6.0 (2024-05-16)
 ==================
diff --git a/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html b/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
index b9a14aa..2db6c3b 100644
--- a/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
+++ b/djangocms_content_expiry/templates/djangocms_content_expiry/admin/icons/additional_content_settings_icon.html
@@ -1,5 +1,5 @@
 {% load static i18n %}
 
-<a class="btn cms-versioning-action-btn related-widget-wrapper-link" id="additional_content_settings_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}">
+<a class="btn cms-versioning-action-btn related-widget-wrapper-link" data-popup="yes" id="additional_content_settings_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}">
     <img src="{% static 'djangocms_content_expiry/svg/file.svg' %}">
 </a>
diff --git a/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html b/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
index ab349db..4d25f19 100644
--- a/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
+++ b/djangocms_content_expiry/templates/djangocms_content_expiry/calendar_icon.html
@@ -1,2 +1,2 @@
 {% load static i18n %}
-<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-versioning-action-btn" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>
+<a class="btn cms-moderation-action-btn js-moderation-action related-widget-wrapper-link cms-versioning-action-btn" data-popup="yes" id="change_content_expiry_id_{{ field_id }}" href="{{ url }}" title="{% trans 'Additional Content Settings' %}"><span class="svg-juxtaposed-font"><img src="{% static 'djangocms_content_expiry/svg/file.svg' %}" /></span></a>