summaryrefslogtreecommitdiffstats
path: root/routers
diff options
context:
space:
mode:
authorLauris BH <lauris@nix.lv>2018-09-17 17:59:49 +0300
committerGitHub <noreply@github.com>2018-09-17 17:59:49 +0300
commit4befec242aa3563f5a8a38bd390d834e4aa2797b (patch)
treef372612f3911ceb304bc6868b051a4c972025013 /routers
parent756eafaaf68b3cadb3f33f37554a6aa2d83921ef (diff)
downloadgitea-4befec242aa3563f5a8a38bd390d834e4aa2797b.tar.gz
gitea-4befec242aa3563f5a8a38bd390d834e4aa2797b.zip
Code review UI improvements and bugfixes (#4682)
* Code review UI improvements * More fixes to dark theme * Style fix * Fix to allow add code review comments only on review files tab * More readability dark style fixes * Fix commenting on deleted files. Fixes #4752 * Fix line blame getting for multiple corner cases
Diffstat (limited to 'routers')
-rw-r--r--routers/repo/pull_review.go14
1 files changed, 12 insertions, 2 deletions
diff --git a/routers/repo/pull_review.go b/routers/repo/pull_review.go
index 1269a7a7e7..9d1db3ff4e 100644
--- a/routers/repo/pull_review.go
+++ b/routers/repo/pull_review.go
@@ -128,13 +128,23 @@ func SubmitReview(ctx *context.Context, form auth.SubmitReviewForm) {
}
}
- if form.HasEmptyContent() {
+ review, err = models.GetCurrentReview(ctx.User, issue)
+ if err == nil {
+ review.Issue = issue
+ if errl := review.LoadCodeComments(); errl != nil {
+ ctx.ServerError("LoadCodeComments", err)
+ return
+ }
+ }
+
+ if ((err == nil && len(review.CodeComments) == 0) ||
+ (err != nil && models.IsErrReviewNotExist(err))) &&
+ form.HasEmptyContent() {
ctx.Flash.Error(ctx.Tr("repo.issues.review.content.empty"))
ctx.Redirect(fmt.Sprintf("%s/pulls/%d/files", ctx.Repo.RepoLink, issue.Index))
return
}
- review, err = models.GetCurrentReview(ctx.User, issue)
if err != nil {
if !models.IsErrReviewNotExist(err) {
ctx.ServerError("GetCurrentReview", err)