Skip to content

Commit 1ac8f6f

Browse files
HarshitOnGitHubtechknowlogick
authored andcommitted
Don't list an issue on its own dependency list UI. (#5658)
Fixes: #4684.
1 parent 270fa6d commit 1ac8f6f

File tree

2 files changed

+8
-2
lines changed

2 files changed

+8
-2
lines changed

public/js/index.js

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2810,21 +2810,27 @@ function deleteDependencyModal(id, type) {
28102810

28112811
function initIssueList() {
28122812
var repolink = $('#repolink').val();
2813-
$('.new-dependency-drop-list')
2813+
$('#new-dependency-drop-list')
28142814
.dropdown({
28152815
apiSettings: {
28162816
url: suburl + '/api/v1/repos/' + repolink + '/issues?q={query}',
28172817
onResponse: function(response) {
28182818
var filteredResponse = {'success': true, 'results': []};
2819+
var currIssueId = $('#new-dependency-drop-list').data('issue-id');
28192820
// Parse the response from the api to work with our dropdown
28202821
$.each(response, function(index, issue) {
2822+
// Don't list current issue in the dependency list.
2823+
if(issue.id === currIssueId) {
2824+
return;
2825+
}
28212826
filteredResponse.results.push({
28222827
'name' : '#' + issue.number + ' ' + htmlEncode(issue.title),
28232828
'value' : issue.id
28242829
});
28252830
});
28262831
return filteredResponse;
28272832
},
2833+
cache: false,
28282834
},
28292835

28302836
fullTextSearch: true

templates/repo/issue/view_content/sidebar.tmpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@
321321
<form method="POST" action="{{$.RepoLink}}/issues/{{.Issue.Index}}/dependency/add" id="addDependencyForm">
322322
{{$.CsrfTokenHtml}}
323323
<div class="ui fluid action input">
324-
<div class="ui search selection dropdown new-dependency-drop-list" style="min-width: 13.9rem;border-radius: 4px 0 0 4px;border-right: 0;white-space: nowrap;">
324+
<div class="ui search selection dropdown" id="new-dependency-drop-list" data-issue-id="{{.Issue.ID}}" style="min-width: 13.9rem;border-radius: 4px 0 0 4px;border-right: 0;white-space: nowrap;">
325325
<input name="newDependency" type="hidden">
326326
<i class="dropdown icon"></i>
327327
<input type="text" class="search">

0 commit comments

Comments
 (0)