Skip to content

Use fetch form action for lock/unlock/pin/unpin on sidebar #25380

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

Merged
merged 17 commits into from
Jun 29, 2023
Merged

Use fetch form action for lock/unlock/pin/unpin on sidebar #25380

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
e0dde35
lock-pin-fetxh
HesterG Jun 20, 2023
16d2650
Merge branch 'go-gitea:main' into lock-pin-fetch
HesterG Jun 20, 2023
901a2dc
update
HesterG Jun 20, 2023
2885e76
Merge branch 'main' into lock-pin-fetch
HesterG Jun 20, 2023
d74211e
Merge branch 'main' into lock-pin-fetch
HesterG Jun 21, 2023
bf79406
Merge branch 'main' into lock-pin-fetch
HesterG Jun 21, 2023
a58278f
Merge branch 'main' into lock-pin-fetch
silverwind Jun 22, 2023
6476dac
improve button loading state
silverwind Jun 22, 2023
d2fa452
remove class from second form
silverwind Jun 22, 2023
051fa1f
Merge branch 'main' into lock-pin-fetch
GiteaBot Jun 23, 2023
733d2c3
Merge branch 'main' into lock-pin-fetch
HesterG Jun 26, 2023
be7cdf6
Merge branch 'main' into lock-pin-fetch
HesterG Jun 27, 2023
be59c3d
Merge branch 'main' into lock-pin-fetch
HesterG Jun 28, 2023
8c1639a
fix height calculation
silverwind Jun 28, 2023
1e1173e
Merge branch 'main' into lock-pin-fetch
HesterG Jun 29, 2023
651a222
Update animations.css
wxiaoguang Jun 29, 2023
b6dfe9b
Merge branch 'main' into lock-pin-fetch
GiteaBot Jun 29, 2023
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
13 changes: 5 additions & 8 deletions routers/web/repo/issue_lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,12 @@ func LockIssue(ctx *context.Context) {
}

if issue.IsLocked {
ctx.Flash.Error(ctx.Tr("repo.issues.lock_duplicate"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.lock_duplicate"))
return
}

if !form.HasValidReason() {
ctx.Flash.Error(ctx.Tr("repo.issues.lock.unknown_reason"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.lock.unknown_reason"))
return
}

Expand All @@ -40,7 +38,7 @@ func LockIssue(ctx *context.Context) {
return
}

ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}

// UnlockIssue unlocks a previously locked issue.
Expand All @@ -51,8 +49,7 @@ func UnlockIssue(ctx *context.Context) {
}

if !issue.IsLocked {
ctx.Flash.Error(ctx.Tr("repo.issues.unlock_error"))
ctx.Redirect(issue.Link())
ctx.JSONError(ctx.Tr("repo.issues.unlock_error"))
return
}

Expand All @@ -64,5 +61,5 @@ func UnlockIssue(ctx *context.Context) {
return
}

ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}
2 changes: 1 addition & 1 deletion routers/web/repo/issue_pin.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ func IssuePinOrUnpin(ctx *context.Context) {
return
}

ctx.Redirect(issue.Link())
ctx.JSONRedirect(issue.Link())
}

// IssueUnpin unpins a Issue
Expand Down
4 changes: 2 additions & 2 deletions templates/repo/issue/view_content/sidebar.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -556,7 +556,7 @@
<div class="ui divider"></div>

{{if or .PinEnabled .Issue.IsPinned}}
<form class="gt-mt-2" method="post" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
<form class="gt-mt-2 form-fetch-action single-button-form" method="post" {{if $.NewPinAllowed}}action="{{.Issue.Link}}/pin"{{else}}data-tooltip-content="{{.locale.Tr "repo.issues.max_pinned"}}"{{end}}>
{{$.CsrfTokenHtml}}
<button class="fluid ui button {{if not $.NewPinAllowed}}disabled{{end}}">
{{if not .Issue.IsPinned}}
Expand Down Expand Up @@ -599,7 +599,7 @@
{{end}}
</div>

<form class="ui form" action="{{.Issue.Link}}{{if .Issue.IsLocked}}/unlock{{else}}/lock{{end}}"
<form class="ui form form-fetch-action" action="{{.Issue.Link}}{{if .Issue.IsLocked}}/unlock{{else}}/lock{{end}}"
method="post">
{{.CsrfTokenHtml}}

Expand Down
15 changes: 11 additions & 4 deletions web_src/css/modules/animations.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,10 @@
content: "";
position: absolute;
display: block;
height: 4rem;
aspect-ratio: 1 / 1;
left: 50%;
top: 50%;
max-height: 100%;
max-width: 100%;
height: min(4em, 66.6%);
aspect-ratio: 1;
transform: translate(-50%, -50%);
animation: isloadingspin 500ms infinite linear;
border-width: 4px;
Expand All @@ -35,6 +33,15 @@
border-width: 2px;
}

/* for single form button, the loading state should be on the button, but not go semi-transparent, just replace the text on the button with the loader. */
form.single-button-form.is-loading > * {
opacity: 1;
}

form.single-button-form.is-loading .button {
color: transparent;
}

.markup pre.is-loading,
.editor-loading.is-loading,
.pdf-content.is-loading {
Expand Down