Skip to content

Commit 740b6e1

Browse files
authored
Fix JS error when editing a merged PR's title (#30990)
1 parent 2611249 commit 740b6e1

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

templates/repo/issue/view_title.tmpl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,7 @@
2626
</div>
2727
<div class="issue-title-buttons">
2828
<button class="ui small basic cancel button">{{ctx.Locale.Tr "repo.issues.cancel"}}</button>
29-
<button class="ui small primary button"
30-
data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title"
31-
{{if .Issue.IsPull}}data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch"{{end}}>
29+
<button class="ui small primary button" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/title">
3230
{{ctx.Locale.Tr "repo.issues.save"}}
3331
</button>
3432
</div>
@@ -77,7 +75,7 @@
7775
{{ctx.Locale.Tr "repo.pulls.title_desc" .NumCommits $headHref $baseHref}}
7876
</span>
7977
{{end}}
80-
<span id="pull-desc-editor" class="tw-hidden flex-text-block">
78+
<span id="pull-desc-editor" class="tw-hidden flex-text-block" data-target-update-url="{{$.RepoLink}}/pull/{{.Issue.Index}}/target_branch">
8179
<div class="ui floating filter dropdown">
8280
<div class="ui basic small button tw-mr-0">
8381
<span class="text">{{ctx.Locale.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span>

web_src/js/features/repo-issue.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -626,9 +626,12 @@ export function initRepoIssueTitleEdit() {
626626
showElem(issueTitleDisplay);
627627
showElem('#pull-desc-display');
628628
});
629+
630+
const pullDescEditor = document.querySelector('#pull-desc-editor'); // it may not exist for a merged PR
631+
const prTargetUpdateUrl = pullDescEditor?.getAttribute('data-target-update-url');
632+
629633
const editSaveButton = issueTitleEditor.querySelector('.ui.primary.button');
630634
editSaveButton.addEventListener('click', async () => {
631-
const prTargetUpdateUrl = editSaveButton.getAttribute('data-target-update-url');
632635
const newTitle = issueTitleInput.value.trim();
633636
try {
634637
if (newTitle && newTitle !== oldTitle) {

0 commit comments

Comments
 (0)