Skip to content

Create new issue from code #14863

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.

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

Merged
merged 8 commits into from
Mar 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions routers/repo/issue.go
Original file line number Diff line number Diff line change
Expand Up @@ -781,6 +781,7 @@ func NewIssue(ctx *context.Context) {
ctx.Data["TitleQuery"] = title
body := ctx.Query("body")
ctx.Data["BodyQuery"] = body

ctx.Data["IsProjectsEnabled"] = ctx.Repo.CanRead(models.UnitTypeProjects)
ctx.Data["IsAttachmentEnabled"] = setting.Attachment.Enabled
upload.AddUploadContext(ctx, "comment")
Expand Down
5 changes: 3 additions & 2 deletions templates/repo/issue/comment_tab.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,9 @@
</div>
<div class="field">
<div class="ui bottom active tab" data-tab="write">
<textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}">
{{if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end}}</textarea>
<textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}">
{{- if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end -}}
</textarea>
</div>
<div class="ui bottom tab markdown" data-tab="preview">
{{.i18n.Tr "loading"}}
Expand Down
9 changes: 9 additions & 0 deletions templates/repo/view_file.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,15 @@
{{end}}
</tbody>
</table>
<div class="code-view-menu-list ui fluid popup transition hidden">
<div class="ui column relaxed equal height">
<div class="column">
<div class="ui link list">
<a class="item ref-in-new-issue" href="{{.RepoLink}}/issues/new?body={{URLJoin AppUrl .RepoLink}}/src/commit/{{.CommitID}}/{{EscapePound .TreePath}}">{{.i18n.Tr "repo.issues.context.reference_issue"}}</a>
</div>
</div>
</div>
</div>
{{end}}
{{end}}
</div>
Expand Down
69 changes: 69 additions & 0 deletions web_src/js/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -2167,6 +2167,45 @@ function searchRepositories() {
});
}

function showCodeViewMenu() {
// Get clicked tr
const $code_tr = $('.code-view td.lines-code.active').parent();

// Reset code line marker
$('.code-view-menu-list').appendTo($('.code-view'));
$('.code-line-marker').remove();

// Generate new one
const icon_wrap = $('<div>', {
class: 'code-line-marker'
}).prependTo($code_tr.find('td:eq(0)').get(0)).hide();

const a_wrap = $('<a>', {
class: 'code-line-link'
}).appendTo(icon_wrap);

$('<i>', {
class: 'dropdown icon',
style: 'margin: 0px;'
}).appendTo(a_wrap);

icon_wrap.css({
left: '-7px',
display: 'block',
});

$('.code-view-menu-list').css({
'min-width': '220px',
});

// Popup the menu
$('.code-line-link').popup({
popup: $('.code-view-menu-list'),
on: 'click',
lastResort: 'bottom left',
});
}

function initCodeView() {
if ($('.code-view .lines-num').length > 0) {
$(document).on('click', '.lines-num span', function (e) {
Expand All @@ -2179,6 +2218,9 @@ function initCodeView() {
}
selectRange($list, $list.filter(`[rel=${$select.attr('id')}]`), (e.shiftKey ? $list.filter('.active').eq(0) : null));
deSelect();

// show code view menu marker
showCodeViewMenu();
});

$(window).on('hashchange', () => {
Expand All @@ -2193,13 +2235,21 @@ function initCodeView() {
if (m) {
$first = $list.filter(`[rel=${m[1]}]`);
selectRange($list, $first, $list.filter(`[rel=${m[2]}]`));

// show code view menu marker
showCodeViewMenu();

$('html, body').scrollTop($first.offset().top - 200);
return;
}
m = window.location.hash.match(/^#(L|n)(\d+)$/);
if (m) {
$first = $list.filter(`[rel=L${m[2]}]`);
selectRange($list, $first);

// show code view menu marker
showCodeViewMenu();

$('html, body').scrollTop($first.offset().top - 200);
}
}).trigger('hashchange');
Expand Down Expand Up @@ -2752,11 +2802,30 @@ function selectRange($list, $select, $from) {
}
$list.filter(classes.join(',')).addClass('active');
changeHash(`#L${a}-L${b}`);

// add hashchange to permalink
const $issue = $('a.ref-in-new-issue');
const matched = $issue.attr('href').match(/%23L\d+$|%23L\d+-L\d+$/);
if (matched) {
$issue.attr('href', $issue.attr('href').replace($issue.attr('href').substr(matched.index), `%23L${a}-L${b}`));
} else {
$issue.attr('href', `${$issue.attr('href')}%23L${a}-L${b}`);
}

return;
}
}
$select.addClass('active');
changeHash(`#${$select.attr('rel')}`);

// add hashchange to permalink
const $issue = $('a.ref-in-new-issue');
const matched = $issue.attr('href').match(/%23L\d+$|%23L\d+-L\d+$/);
if (matched) {
$issue.attr('href', $issue.attr('href').replace($issue.attr('href').substr(matched.index), `%23${$select.attr('rel')}`));
} else {
$issue.attr('href', `${$issue.attr('href')}%23${$select.attr('rel')}`);
}
}

$(() => {
Expand Down
7 changes: 7 additions & 0 deletions web_src/less/_repository.less
Original file line number Diff line number Diff line change
Expand Up @@ -3145,3 +3145,10 @@ td.blob-excerpt {
transform: scale(105%);
box-shadow: 0 .5rem 1rem var(--color-shadow) !important;
}

.code-line-marker {
width: 13px;
height: 20px;
background-color: rgb(34 36 38 / 15%);
position: absolute;
}