MarcoBuster/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea synced 2024-08-19 13:50:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add support for "Show/Hide outdated"

Browse Source 
Signed-off-by: Jonas Franz <info@jonasfranz.software>
This commit is contained in:
Jonas Franz 2018-05-15 16:34:19 +02:00
parent 7c1edf93ff
commit 8bb51135b6
No known key found for this signature in database
GPG Key ID: 506AEEBE80BEDECD
6 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
models/issue_comment.go
View File

@ -853,8 +853,13 @@ func fetchCodeCommentsByReview(e Engine, issue *Issue, currentUser *User, review
IssueID: issue.ID, IssueID: issue.ID,
ReviewID: review.ID, ReviewID: review.ID,
} }
conds := opts.toConds()
if review.ID == 0 {
conds.And(builder.Eq{"invalidated": false})
}
var comments []*Comment var comments []*Comment
if err := e.Where(opts.toConds().And(builder.Eq{"invalidated": false})). if err := e.Where(conds).
Asc("comment.created_unix"). Asc("comment.created_unix").
Asc("comment.id"). Asc("comment.id").
Find(&comments); err != nil { Find(&comments); err != nil {

2
options/locale/locale_en-US.ini
View File

@ -764,6 +764,8 @@ issues.review.comment = "reviewed %s"
issues.review.reject = "rejected these changes %s" issues.review.reject = "rejected these changes %s"
issues.review.pending = Pending issues.review.pending = Pending
issues.review.review = Review issues.review.review = Review
issues.review.show_outdated = Show outdated
issues.review.hide_outdated = Hide outdated
pulls.desc = Enable merge requests and code reviews. pulls.desc = Enable merge requests and code reviews.
pulls.new = New Pull Request pulls.new = New Pull Request

2
public/css/index.css
View File

File diff suppressed because one or more lines are too long

17
public/js/index.js
View File

@ -762,6 +762,23 @@ function initRepository() {
} }
function initPullRequestReview() { function initPullRequestReview() {
$('.show-outdated').on('click', function (e) {
e.preventDefault();
var id = $(this).data('comment');
$(this).addClass("hide");
$("#code-comments-" + id).removeClass('hide');
$("#code-preview-" + id).removeClass('hide');
$("#hide-outdated-" + id).removeClass('hide');
});
$('.hide-outdated').on('click', function (e) {
e.preventDefault();
var id = $(this).data('comment');
$(this).addClass("hide");
$("#code-comments-" + id).addClass('hide');
$("#code-preview-" + id).addClass('hide');
$("#show-outdated-" + id).removeClass('hide');
});
if ($('.repository.pull.diff').length == 0) { if ($('.repository.pull.diff').length == 0) {
return; return;
} }

2
public/less/_base.less
View File

@ -442,7 +442,7 @@ footer {
} }
.hide { .hide {
display: none; display: none !important;
} }
.center { .center {
text-align: center; text-align: center;

16
templates/repo/issue/view_content/comments.tmpl
View File

@ -260,14 +260,20 @@
{{range $line, $comms := $lines}} {{range $line, $comms := $lines}}
<div class="ui segments"> <div class="ui segments">
<div class="ui segment"> <div class="ui segment">
{{if (index $comms 0).Invalidated}} {{$invalid := (index $comms 0).Invalidated}}
<button class="ui icon button"> {{if $invalid}}
<i class="indend icon"></i> <button id="show-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="ui compact right labeled button show-outdated">
<i class="octicon octicon-fold"></i>
{{$.i18n.Tr "repo.issues.review.show_outdated"}}
</button>
<button id="hide-outdated-{{(index $comms 0).ID}}" data-comment="{{(index $comms 0).ID}}" class="hide ui compact right labeled button hide-outdated">
<i class="octicon octicon-fold"></i>
{{$.i18n.Tr "repo.issues.review.hide_outdated"}}
</button> </button>
{{end}} {{end}}
<code>{{$filename}}</code> <code>{{$filename}}</code>
</div> </div>
<div class="ui table segment"> <div id="code-preview-{{(index $comms 0).ID}}" class="ui table segment{{if $invalid}} hide{{end}}">
<div class="diff-file-box diff-box file-content tab-size-8"> <div class="diff-file-box diff-box file-content tab-size-8">
<div class="file-body file-code code-view code-diff code-diff-unified"> <div class="file-body file-code code-view code-diff code-diff-unified">
<table> <table>
@ -387,7 +393,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ui segment"> <div id="code-comments-{{(index $comms 0).ID}}" class="ui segment{{if $invalid}} hide{{end}}">
<div class="ui comments"> <div class="ui comments">
{{range $comms}} {{range $comms}}
{{ $createdSubStr:= TimeSinceUnix .CreatedUnix $.Lang }} {{ $createdSubStr:= TimeSinceUnix .CreatedUnix $.Lang }}