Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Comment - Reference in new issue #14366

Merged
merged 11 commits into from
Jan 21, 2021
Merged

Comment - Reference in new issue #14366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2eb2a54
Implemented "Reference in new issue"
KN4CK3R Jan 16, 2021
96e9788
Fixed menu style on "pulls/x/files" because "button" has a style.
KN4CK3R Jan 16, 2021
304d6ec
Added context menu for PR file comments.
KN4CK3R Jan 17, 2021
e360800
Fixed linter errors.
KN4CK3R Jan 17, 2021
7e9beb1
Merge remote-tracking branch 'master/master' into feature-reference-i…
KN4CK3R Jan 17, 2021
41e8279
Reverted changes because of #14339.
KN4CK3R Jan 17, 2021
9f7b0ba
Use only a single modal for every comment.
KN4CK3R Jan 18, 2021
b7fc326
Use current repository as default. Added search filter.
KN4CK3R Jan 18, 2021
072f513
Added suggested changes.
KN4CK3R Jan 18, 2021
dbcd9ab
Fixed assignment.
KN4CK3R Jan 18, 2021
ca40b07
Merge branch 'master' into feature-reference-in-issue
6543 Jan 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions modules/templates/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,12 +377,6 @@ func NewFuncMap() []template.FuncMap {
html += "</span>"
return template.HTML(html)
},
"cond": func(condition bool, a, b interface{}) interface{} {
if condition {
return a
}
return b
},
}}
}

Expand Down
9 changes: 7 additions & 2 deletions templates/repo/issue/view_content/context_menu.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
{{svg "octicon-kebab-horizontal"}}
</a>
<div class="menu">
{{ $referenceUrl:= cond (.issue) (Printf "%s%s/issues/%d#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag) (Printf "%s%s/pulls/%d/files#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag) }}
{{ $referenceUrl := "" }}
{{ if .issue }}
{{ $referenceUrl := Printf "%s%s/issues/%d#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag }}
KN4CK3R marked this conversation as resolved.
Show resolved Hide resolved
{{ else }}
{{ $referenceUrl := Printf "%s%s/pulls/%d/files#%s" AppUrl .ctx.Repository.FullName .ctx.Issue.Index .item.HashTag }}
KN4CK3R marked this conversation as resolved.
Show resolved Hide resolved
{{ end }}
<div class="item context clipboard" data-clipboard-text="{{$referenceUrl}}">{{.ctx.i18n.Tr "repo.issues.context.copy_link"}}</div>
<div class="item context quote-reply {{if .diff}}quote-reply-diff{{end}}" data-target="{{.item.ID}}">{{.ctx.i18n.Tr "repo.issues.context.quote_reply"}}</div>
<div class="item context reference-issue" data-target="{{.item.ID}}" data-modal="#reference-issue-modal" data-repository="{{.ctx.Repository.FullName}}" data-poster="{{.item.Poster.GetDisplayName}}" data-reference="{{$referenceUrl}}">{{.ctx.i18n.Tr "repo.issues.context.reference_issue"}}</div>
<div class="item context reference-issue" data-target="{{.item.ID}}" data-modal="#reference-issue-modal" data-poster="{{.item.Poster.GetDisplayName}}" data-reference="{{$referenceUrl}}">{{.ctx.i18n.Tr "repo.issues.context.reference_issue"}}</div>
{{if or .ctx.Permission.IsAdmin .IsCommentPoster .ctx.HasIssuesOrPullsWritePermission}}
<div class="divider"></div>
<div class="item context edit-content">{{.ctx.i18n.Tr "repo.issues.context.edit"}}</div>
Expand Down
2 changes: 1 addition & 1 deletion templates/repo/issue/view_content/reference_issue_dialog.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
{{.i18n.Tr "repo.issues.context.reference_issue"}}
</div>
<div class="content" style="text-align:left">
<form class="ui form" action="/comments/issues" method="post">
<form class="ui form" action="{{ Printf "%s/issues/new" .Repository.Link }}" method="post">
{{.CsrfTokenHtml}}
<div class="ui segment content">
<div class="field">
Expand Down
4 changes: 1 addition & 3 deletions web_src/js/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -941,12 +941,10 @@ async function initRepository() {
const content = $(`#comment-${$this.data('target')}`).text();
const subject = content.split('\n', 1)[0].slice(0, 255);

const repository = $this.data('repository');
const poster = $this.data('poster');
const reference = $this.data('reference');

const $modal = $($this.data('modal'));
$modal.find('form').prop('action', `/${repository}/issues/new`);
$modal.find('input[name="title"').val(subject);
$modal.find('textarea[name="content"]').val(`${content}\n\n_Originally posted by @${poster} in ${reference}_`);

Expand Down Expand Up @@ -2379,7 +2377,7 @@ function initIssueReferenceRepositorySearch() {
},
onChange(_value, _text, $choice) {
const $form = $choice.closest('form');
$form.attr('action', `/${_text}/issues/new`);
$form.attr('action', `${AppSubUrl}/${_text}/issues/new`);
},
fullTextSearch: true
});
Expand Down