MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-14 13:51:29 +01:00
Code Issues Projects Releases Packages Wiki Activity

Improve issue history dialog and make poster can delete their own history (#27323) (#27327)

Browse source 
Backport #27323 by @wxiaoguang

Fix #27313 (see the comment)

And some UI improvements:

### Before


![image](https://github.com/go-gitea/gitea/assets/2114189/420a314d-8f34-4e30-a557-f41cf4f0d2f2)


![image](https://github.com/go-gitea/gitea/assets/2114189/60ca0be4-b55e-4e65-be73-fd53e0d4fc36)


### After


![image](https://github.com/go-gitea/gitea/assets/2114189/d354f815-5a0c-4e63-8d59-d03ed344dbea)


![image](https://github.com/go-gitea/gitea/assets/2114189/6ef437a4-aa6f-4917-a260-00625ee71e79)


![image](https://github.com/go-gitea/gitea/assets/2114189/9d88a36c-616b-4dc9-8c6b-76adaad8acf6)

Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
Giteabot 2023-09-28 17:46:46 +08:00 committed by GitHub
parent b00489886d
commit 71d1bfea7f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 21 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
routers/web/repo/issue_content_history.go
View file

@ -11,7 +11,6 @@ import (
"code.gitea.io/gitea/models/avatars" "code.gitea.io/gitea/models/avatars"
issues_model "code.gitea.io/gitea/models/issues" issues_model "code.gitea.io/gitea/models/issues"
"code.gitea.io/gitea/models/unit"
"code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/context"
"code.gitea.io/gitea/modules/log" "code.gitea.io/gitea/modules/log"
"code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/setting"
@ -91,11 +90,16 @@ func GetContentHistoryList(ctx *context.Context) {
// Admins or owners can always delete history revisions. Normal users can only delete own history revisions. // Admins or owners can always delete history revisions. Normal users can only delete own history revisions.
func canSoftDeleteContentHistory(ctx *context.Context, issue *issues_model.Issue, comment *issues_model.Comment, func canSoftDeleteContentHistory(ctx *context.Context, issue *issues_model.Issue, comment *issues_model.Comment,
history *issues_model.ContentHistory, history *issues_model.ContentHistory,
) bool { ) (canSoftDelete bool) {
canSoftDelete := false // CanWrite means the doer can manage the issue/PR list
if ctx.Repo.IsOwner() { if ctx.Repo.IsOwner() || ctx.Repo.CanWriteIssuesOrPulls(issue.IsPull) {
canSoftDelete = true canSoftDelete = true
} else if ctx.Repo.CanWrite(unit.TypeIssues) { } else {
// for read-only users, they could still post issues or comments,
// they should be able to delete the history related to their own issue/comment, a case is:
// 1. the user posts some sensitive data
// 2. then the repo owner edits the post but didn't remove the sensitive data
// 3. the poster wants to delete the edited history revision
if comment == nil { if comment == nil {
// the issue poster or the history poster can soft-delete // the issue poster or the history poster can soft-delete
canSoftDelete = ctx.Doer.ID == issue.PosterID || ctx.Doer.ID == history.PosterID canSoftDelete = ctx.Doer.ID == issue.PosterID || ctx.Doer.ID == history.PosterID

7
web_src/css/modules/modal.css
View file

@ -3,13 +3,18 @@
width: fit-content; width: fit-content;
} }
.ui.modal.g-modal-confirm > .inside.close { .ui.modal.g-modal-confirm > .inside.close.icon {
padding: 0; padding: 0;
width: 1em; width: 1em;
height: 1em; height: 1em;
top: 1.2em; top: 1.2em;
} }
.ui.modal > .close.icon[height="16"] {
top: 0.7em; /* fomantic uses absolute layout, so if we have special icon size, it needs this trick to align vertically */
color: var(--color-text-dark);
}
.ui.modal > .header { .ui.modal > .header {
/* can't use display:flex, because some headers have space-separated elements, eg: delete branch modal */ /* can't use display:flex, because some headers have space-separated elements, eg: delete branch modal */
color: var(--color-text-dark); color: var(--color-text-dark);

2
web_src/css/repo.css
View file

@ -2578,12 +2578,14 @@ tbody.commit-list {
.comment-diff-data { .comment-diff-data {
background: var(--color-code-bg); background: var(--color-code-bg);
min-height: 12em;
max-height: calc(100vh - 10.5rem); max-height: calc(100vh - 10.5rem);
overflow-y: auto; overflow-y: auto;
} }
.comment-diff-data pre { .comment-diff-data pre {
line-height: 18px; line-height: 18px;
margin: 1em;
white-space: pre-wrap; white-space: pre-wrap;
word-break: break-all; word-break: break-all;
overflow-wrap: break-word; overflow-wrap: break-word;

7
web_src/js/features/repo-issue-content.js
View file

@ -17,14 +17,15 @@ function showContentHistoryDetail(issueBaseUrl, commentId, historyId, itemTitleH
${svg('octicon-x', 16, 'close icon inside')} ${svg('octicon-x', 16, 'close icon inside')}
<div class="header gt-df gt-ac gt-sb"> <div class="header gt-df gt-ac gt-sb">
<div>${itemTitleHtml}</div> <div>${itemTitleHtml}</div>
<div class="ui dropdown dialog-header-options gt-df gt-ac gt-mr-5 gt-hidden"> <div class="ui dropdown dialog-header-options gt-mr-5 gt-hidden">
${i18nTextOptions}${svg('octicon-triangle-down', 14, 'dropdown icon')} ${i18nTextOptions}
${svg('octicon-triangle-down', 14, 'dropdown icon')}
<div class="menu"> <div class="menu">
<div class="item red text" data-option-item="delete">${i18nTextDeleteFromHistory}</div> <div class="item red text" data-option-item="delete">${i18nTextDeleteFromHistory}</div>
</div> </div>
</div> </div>
</div> </div>
<div class="comment-diff-data gt-text-left gt-p-3 is-loading"></div> <div class="comment-diff-data is-loading"></div>
</div>`); </div>`);
$dialog.appendTo($('body')); $dialog.appendTo($('body'));
$dialog.find('.dialog-header-options').dropdown({ $dialog.find('.dialog-header-options').dropdown({