]> source.dussan.org Git - gitea.git/commitdiff
Use fetch form action for lock/unlock/pin/unpin on sidebar (#25380)
authorHesterG <hestergong@gmail.com>
Thu, 29 Jun 2023 04:16:04 +0000 (12:16 +0800)
committerGitHub <noreply@github.com>
Thu, 29 Jun 2023 04:16:04 +0000 (04:16 +0000)
Before:

<img width="364" alt="Screen Shot 2023-06-20 at 11 59 11"
src="https://github.com/go-gitea/gitea/assets/17645053/ad284b7e-8d21-43be-b178-bbcfd37cb5bd">

Might trigger many posts when keep clicking the buttons above.

<img width="448" alt="Screen Shot 2023-06-20 at 11 52 28"
src="https://github.com/go-gitea/gitea/assets/17645053/a60aa6ac-af74-45e4-b13a-512b436b81b0">
<img width="678" alt="Screen Shot 2023-06-20 at 11 52 37"
src="https://github.com/go-gitea/gitea/assets/17645053/d6662700-3643-4cc7-a2ec-64e1c0f5fbdb">

After (PR sidebar, Same for issue):

https://github.com/go-gitea/gitea/assets/17645053/9df3ad1f-e29c-439b-8bde-e6b917d63cc6

For delete, it is using `base/modal_actions_confirm` subtemplate, and we
might need another general solution for this (maybe add another
attribute to the subtemplate or something)

---------

Co-authored-by: silverwind <me@silverwind.io>
Co-authored-by: Giteabot <teabot@gitea.io>
Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
routers/web/repo/issue_lock.go
routers/web/repo/issue_pin.go
templates/repo/issue/view_content/sidebar.tmpl
web_src/css/modules/animations.css

index 08b76e555f112cfe76343e196b13ef4b4381a04b..93f5a588d91209cec53e1bedcd391e03252617f2 100644 (file)
@@ -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
        }
 
@@ -40,7 +38,7 @@ func LockIssue(ctx *context.Context) {
                return
        }
 
-       ctx.Redirect(issue.Link())
+       ctx.JSONRedirect(issue.Link())
 }
 
 // UnlockIssue unlocks a previously locked issue.
@@ -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
        }
 
@@ -64,5 +61,5 @@ func UnlockIssue(ctx *context.Context) {
                return
        }
 
-       ctx.Redirect(issue.Link())
+       ctx.JSONRedirect(issue.Link())
 }
index 6586372fc5310616070de14f4b9f3d461ad1f0b1..7c1a306e6cef7042536ebad49894f753874dff67 100644 (file)
@@ -31,7 +31,7 @@ func IssuePinOrUnpin(ctx *context.Context) {
                return
        }
 
-       ctx.Redirect(issue.Link())
+       ctx.JSONRedirect(issue.Link())
 }
 
 // IssueUnpin unpins a Issue
index 0bc16844894066aa1781dfb996ff4e2fd6927847..0e36e15e5cdfa8295e843fe5c3c0274ea75d0d62 100644 (file)
                <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}}
                                        {{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}}
 
index cb7ac59b0764dd32dfa1eb526b3cfc6238ffcd1e..876758d8bfb315eceb5d52b8dfa80181eb256ac8 100644 (file)
   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;
   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 {