From 0600a1483791287115ce6b9efc4efcb3138ab4df Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Fri, 22 Oct 2021 12:12:23 +0800 Subject: [PATCH 1/6] improve dialog height, fix issue content history poster --- models/issue.go | 4 ++-- routers/web/repo/issue_content_history.go | 7 ++++--- web_src/js/features/issue-content-history.js | 4 ++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/models/issue.go b/models/issue.go index 823d82a765a79..a27bb1cc7dec9 100644 --- a/models/issue.go +++ b/models/issue.go @@ -804,7 +804,7 @@ func (issue *Issue) ChangeContent(doer *User, content string) (err error) { return fmt.Errorf("UpdateIssueCols: %v", err) } - if err = issues.SaveIssueContentHistory(db.GetEngine(ctx), issue.PosterID, issue.ID, 0, + if err = issues.SaveIssueContentHistory(db.GetEngine(ctx), doer.ID, issue.ID, 0, timeutil.TimeStampNow(), issue.Content, false); err != nil { return fmt.Errorf("SaveIssueContentHistory: %v", err) } @@ -979,7 +979,7 @@ func newIssue(e db.Engine, doer *User, opts NewIssueOptions) (err error) { return err } - if err = issues.SaveIssueContentHistory(e, opts.Issue.PosterID, opts.Issue.ID, 0, + if err = issues.SaveIssueContentHistory(e, doer.ID, opts.Issue.ID, 0, timeutil.TimeStampNow(), opts.Issue.Content, true); err != nil { return err } diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index c0e958203d569..c5ba74070e257 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -88,12 +88,13 @@ func canSoftDeleteContentHistory(ctx *context.Context, issue *models.Issue, comm if ctx.Repo.IsOwner() { canSoftDelete = true } else if ctx.Repo.CanWrite(models.UnitTypeIssues) { - canSoftDelete = ctx.User.ID == history.PosterID if comment == nil { - canSoftDelete = canSoftDelete && (ctx.User.ID == issue.PosterID) + // the issue poster or the history poster can soft-delete + canSoftDelete = ctx.User.ID == issue.PosterID || ctx.User.ID == history.PosterID canSoftDelete = canSoftDelete && (history.IssueID == issue.ID) } else { - canSoftDelete = canSoftDelete && (ctx.User.ID == comment.PosterID) + // the comment poster or the history poster can soft-delete + canSoftDelete = ctx.User.ID == comment.PosterID || ctx.User.ID == history.PosterID canSoftDelete = canSoftDelete && (history.IssueID == issue.ID) canSoftDelete = canSoftDelete && (history.CommentID == comment.ID) } diff --git a/web_src/js/features/issue-content-history.js b/web_src/js/features/issue-content-history.js index 3b830f50f8661..c71d3789d4bf9 100644 --- a/web_src/js/features/issue-content-history.js +++ b/web_src/js/features/issue-content-history.js @@ -12,7 +12,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH if ($dialog.length) return; $dialog = $(` -
+
${itemTitleHtml} @@ -24,7 +24,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
-
+
`); From 5a1a02d4fe6da5b00af4f7585edaecf97d230114 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 23 Oct 2021 18:35:52 +0800 Subject: [PATCH 2/6] use checklines=false when diff --- routers/web/repo/issue_content_history.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/routers/web/repo/issue_content_history.go b/routers/web/repo/issue_content_history.go index c5ba74070e257..dc647b8809a12 100644 --- a/routers/web/repo/issue_content_history.go +++ b/routers/web/repo/issue_content_history.go @@ -138,7 +138,8 @@ func GetContentHistoryDetail(ctx *context.Context) { // compare the current history revision with the previous one dmp := diffmatchpatch.New() - diff := dmp.DiffMain(prevHistoryContentText, history.ContentText, true) + // `checklines=false` makes better diff result + diff := dmp.DiffMain(prevHistoryContentText, history.ContentText, false) diff = dmp.DiffCleanupEfficiency(diff) // use chroma to render the diff html From c89bcc7c9c9313386d5dd9708536532309a18007 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 23 Oct 2021 19:56:47 +0800 Subject: [PATCH 3/6] fix IssueFullPattern bug: "http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test" --- modules/markup/html.go | 2 +- modules/markup/html_internal_test.go | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/modules/markup/html.go b/modules/markup/html.go index d5ae237b5b526..746830720da90 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -94,7 +94,7 @@ var issueFullPatternOnce sync.Once func getIssueFullPattern() *regexp.Regexp { issueFullPatternOnce.Do(func() { issueFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) + - `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`) + `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#](\S+)?)?\b`) }) return issueFullPattern } diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index dbad350de2c56..f9ef90744b173 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -265,6 +265,10 @@ func TestRender_FullIssueURLs(t *testing.T) { `person/repo#4`) test("http://localhost:3000/gogits/gogs/issues/4", `#4`) + test("http://localhost:3000/gogits/gogs/issues/4 test", + `#4 test`) + test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test", + `#4 test`) } func TestRegExp_sha1CurrentPattern(t *testing.T) { From db525372b3612bf39faabe9c5eca487a4ab3fb93 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 23 Oct 2021 20:01:42 +0800 Subject: [PATCH 4/6] fix checkbox rendering in markdown --- web_src/less/markup/content.less | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less index 8d9858f0df309..e86e2d9f99dba 100644 --- a/web_src/less/markup/content.less +++ b/web_src/less/markup/content.less @@ -158,9 +158,12 @@ .task-list-item { list-style-type: none; + position: relative; input[type="checkbox"] { - margin: 0 6px .25em -1.6em; + position: absolute; + top: .25em; + left: -1.6em; } } From 72e1b60304a3ad8334cb0e32e9d3603568a1d064 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 23 Oct 2021 20:35:35 +0800 Subject: [PATCH 5/6] revert --- modules/markup/html.go | 2 +- modules/markup/html_internal_test.go | 4 ---- web_src/less/markup/content.less | 5 +---- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/modules/markup/html.go b/modules/markup/html.go index 746830720da90..d5ae237b5b526 100644 --- a/modules/markup/html.go +++ b/modules/markup/html.go @@ -94,7 +94,7 @@ var issueFullPatternOnce sync.Once func getIssueFullPattern() *regexp.Regexp { issueFullPatternOnce.Do(func() { issueFullPattern = regexp.MustCompile(regexp.QuoteMeta(setting.AppURL) + - `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#](\S+)?)?\b`) + `\w+/\w+/(?:issues|pulls)/((?:\w{1,10}-)?[1-9][0-9]*)([\?|#]\S+.(\S+)?)?\b`) }) return issueFullPattern } diff --git a/modules/markup/html_internal_test.go b/modules/markup/html_internal_test.go index f9ef90744b173..dbad350de2c56 100644 --- a/modules/markup/html_internal_test.go +++ b/modules/markup/html_internal_test.go @@ -265,10 +265,6 @@ func TestRender_FullIssueURLs(t *testing.T) { `person/repo#4`) test("http://localhost:3000/gogits/gogs/issues/4", `#4`) - test("http://localhost:3000/gogits/gogs/issues/4 test", - `#4 test`) - test("http://localhost:3000/gogits/gogs/issues/4?a=1&b=2#comment-123 test", - `#4 test`) } func TestRegExp_sha1CurrentPattern(t *testing.T) { diff --git a/web_src/less/markup/content.less b/web_src/less/markup/content.less index e86e2d9f99dba..8d9858f0df309 100644 --- a/web_src/less/markup/content.less +++ b/web_src/less/markup/content.less @@ -158,12 +158,9 @@ .task-list-item { list-style-type: none; - position: relative; input[type="checkbox"] { - position: absolute; - top: .25em; - left: -1.6em; + margin: 0 6px .25em -1.6em; } } From f0ba16f828f2f78060b3926a7e2b4055e03eb90c Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sat, 23 Oct 2021 22:08:41 +0800 Subject: [PATCH 6/6] fix unit test --- models/issue_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/models/issue_test.go b/models/issue_test.go index d726a24344766..8894d8020176c 100644 --- a/models/issue_test.go +++ b/models/issue_test.go @@ -357,6 +357,7 @@ func testInsertIssue(t *testing.T, title, content string, expectIndex int64) *Is issue := Issue{ RepoID: repo.ID, PosterID: user.ID, + Poster: user, Title: title, Content: content, }