Fix JS error when editing a merged PR's title (#30990) (#31001)

Backport #30990 by @wxiaoguang

Regression of Fix issue/PR title edit (#30858)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>

diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl
index 4415ad79f519af00a4718952f33e161449e47669..097d7b1f7c4e07636161f30d5ea1e4527bd2325c 100644 (file)
--- a/templates/repo/issue/view_title.tmpl
+++ b/templates/repo/issue/view_title.tmpl
@@ -26,9 +26,7 @@
                </div>
                <div class="issue-title-buttons">
                        <button class="ui small basic cancel button">{{ctx.Locale.Tr "repo.issues.cancel"}}</button>
-                       <button class="ui small primary button"
-                                                       data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title"
-                                                       {{if .Issue.IsPull}}data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch"{{end}}>
+                       <button class="ui small primary button" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
                                {{ctx.Locale.Tr "repo.issues.save"}}
                        </button>
                </div>
@@ -77,7 +75,7 @@
                                                        {{ctx.Locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref}}
                                                </span>
                                        {{end}}
-                                       <span id="pull-desc-editor" class="tw-hidden flex-text-block">
+                                       <span id="pull-desc-editor" class="tw-hidden flex-text-block" data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch">
                                                <div class="ui floating filter dropdown">
                                                        <div class="ui basic small button tw-mr-0">
                                                                <span class="text">{{ctx.Locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span>

diff --git a/web_src/js/features/repo-issue.js b/web_src/js/features/repo-issue.js
index 8ee681aedc5f9ca6779884f0a55a760e2f031194..519db34934b65fe92d9473fda32b9c09fe7a1a8d 100644 (file)
--- a/web_src/js/features/repo-issue.js
+++ b/web_src/js/features/repo-issue.js
@@ -626,9 +626,12 @@ export function initRepoIssueTitleEdit() {
     showElem(issueTitleDisplay);
     showElem('#pull-desc-display');
   });
+
+  const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
+  const prTargetUpdateUrl = pullDescEditor?.getAttribute('data-target-update-url');
+
   const editSaveButton = issueTitleEditor.querySelector('.ui.primary.button');
   editSaveButton.addEventListener('click', async () => {
-    const prTargetUpdateUrl = editSaveButton.getAttribute('data-target-update-url');
     const newTitle = issueTitleInput.value.trim();
     try {
       if (newTitle && newTitle !== oldTitle) {