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

Fix issue content history problems, improve UI #17404

Merged
merged 9 commits into from
Oct 23, 2021
Merged

Fix issue content history problems, improve UI #17404

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0600a14
improve dialog height, fix issue content history poster
wxiaoguang Oct 22, 2021
5a1a02d
use checklines=false when diff
wxiaoguang Oct 23, 2021
c89bcc7
fix IssueFullPattern bug: "http://localhost:3000/gogits/gogs/issues/4…
wxiaoguang Oct 23, 2021
db52537
fix checkbox rendering in markdown
wxiaoguang Oct 23, 2021
e811a41
Merge branch 'main' into issue-content-history-fix
wxiaoguang Oct 23, 2021
72e1b60
revert
wxiaoguang Oct 23, 2021
357b326
Merge branch 'main' into issue-content-history-fix
wxiaoguang Oct 23, 2021
f0ba16f
fix unit test
wxiaoguang Oct 23, 2021
87e99f9
Merge branch 'issue-content-history-fix' of github.com:wxiaoguang/git…
wxiaoguang Oct 23, 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
4 changes: 2 additions & 2 deletions models/issue.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down Expand Up @@ -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
}
Expand Down
7 changes: 4 additions & 3 deletions routers/web/repo/issue_content_history.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions web_src/js/features/issue-content-history.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
if ($dialog.length) return;

$dialog = $(`
<div class="ui modal content-history-detail-dialog" style="min-height: 50%;">
<div class="ui modal content-history-detail-dialog">
<i class="close icon inside"></i>
<div class="header">
${itemTitleHtml}
Expand All @@ -24,7 +24,7 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
</div>
</div>
<!-- ".modal .content" style was polluted in "_base.less": "&.modal > .content" -->
<div class="scrolling content" style="text-align: left;">
<div class="scrolling content" style="text-align: left; min-height: 30vh;">
<div class="ui loader active"></div>
</div>
</div>`);
Expand Down