From 86736193fe7db3ac4014f32d965bc21d9e9436ba Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sat, 13 Apr 2024 09:46:02 +0200
Subject: [PATCH] Fix admin notice view-detail (#30450)
Fix https://github.com/go-gitea/gitea/issues/30434, regression from
https://github.com/go-gitea/gitea/pull/30115.
I also removed the date insertion into the modal which was also broken
since that date was switched to `absolute-date` because I see no real
purpose to putting that date into the modal.
Result:
<img width="1038" alt="image"
src="https://github.com/go-gitea/gitea/assets/115237/aa2eb8b4-73dc-4d98-9b80-3f276f89d9e5">
(cherry picked from commit 8fd8978b4934865c2b041216e84e923ad574a4c7)
---
templates/admin/notice.tmpl | 5 +----
web_src/js/features/admin/common.js | 8 ++++----
2 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/templates/admin/notice.tmpl b/templates/admin/notice.tmpl
index 5ea003e5ec..33d8a2f963 100644
--- a/templates/admin/notice.tmpl
+++ b/templates/admin/notice.tmpl
@@ -62,10 +62,7 @@
<div class="ui modal admin" id="detail-modal">
<div class="header">{{ctx.Locale.Tr "admin.notices.view_detail_header"}}</div>
- <div class="content">
- <div class="sub header"></div>
- <pre></pre>
- </div>
+ <div class="content"><pre></pre></div>
</div>
{{template "admin/layout_footer" .}}
diff --git a/web_src/js/features/admin/common.js b/web_src/js/features/admin/common.js
index f388b1122e..b35502d52f 100644
--- a/web_src/js/features/admin/common.js
+++ b/web_src/js/features/admin/common.js
@@ -207,13 +207,13 @@ export function initAdminCommon() {
// Notice
if (document.querySelector('.admin.notice')) {
- const $detailModal = document.getElementById('detail-modal');
+ const detailModal = document.getElementById('detail-modal');
// Attach view detail modals
$('.view-detail').on('click', function () {
- $detailModal.find('.content pre').text($(this).parents('tr').find('.notice-description').text());
- $detailModal.find('.sub.header').text(this.closest('tr')?.querySelector('relative-time')?.getAttribute('title'));
- $detailModal.modal('show');
+ const description = this.closest('tr').querySelector('.notice-description').textContent;
+ detailModal.querySelector('.content pre').textContent = description;
+ $(detailModal).modal('show');
return false;
});