From 224ee0d4e539510b82125876684e9f9c5fde0dfb Mon Sep 17 00:00:00 2001
From: silverwind <me@silverwind.io>
Date: Sun, 11 Jun 2023 04:54:30 +0200
Subject: [PATCH] Fix strange UI behavior of cancelling dismiss review modal
 (#25172)

Backport clean cherry-picks of
https://github.com/go-gitea/gitea/pull/25133 and
https://github.com/go-gitea/gitea/pull/25162 to 1.20.
---
 templates/repo/issue/view_content/sidebar.tmpl | 4 ++--
 web_src/js/features/repo-issue.js              | 7 -------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/templates/repo/issue/view_content/sidebar.tmpl b/templates/repo/issue/view_content/sidebar.tmpl
index ebb844bc00..23e2c18547 100644
--- a/templates/repo/issue/view_content/sidebar.tmpl
+++ b/templates/repo/issue/view_content/sidebar.tmpl
@@ -58,10 +58,10 @@
 						</div>
 						<div class="gt-df gt-ac gt-gap-3">
 							{{if (and $.Permission.IsAdmin (or (eq .Review.Type 1) (eq .Review.Type 3)) (not $.Issue.IsClosed))}}
-								<a href="#" class="ui muted icon gt-df gt-ac dismiss-review-btn" data-review-id="dismiss-review-{{.Review.ID}}" data-tooltip-content="{{$.locale.Tr "repo.issues.dismiss_review"}}">
+								<a href="#" class="ui muted icon gt-df gt-ac show-modal" data-tooltip-content="{{$.locale.Tr "repo.issues.dismiss_review"}}" data-modal="#dismiss-review-modal-{{.Review.ID}}">
 									{{svg "octicon-x" 20}}
 								</a>
-								<div class="ui small modal" id="dismiss-review-modal">
+								<div class="ui small modal" id="dismiss-review-modal-{{.Review.ID}}">
 									<div class="header">
 										{{$.locale.Tr "repo.issues.dismiss_review"}}
 									</div>
diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index 71d82325ac..0dc5728f58 100644
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -358,13 +358,6 @@ export function initRepoIssueComments() {
     ).then(() => window.location.reload());
   });
 
-  $('.dismiss-review-btn').on('click', function (e) {
-    e.preventDefault();
-    const $this = $(this);
-    const $dismissReviewModal = $this.next();
-    $dismissReviewModal.modal('show');
-  });
-
   $(document).on('click', (event) => {
     const urlTarget = $(':target');
     if (urlTarget.length === 0) return;