use link-action button

Author: Zettat123

routers/web/repo/actions/view.go

@@ -840,10 +840,9 @@ func ArtifactsDownloadView(ctx *context_module.Context) {
 
 func ApproveAllChecks(ctx *context_module.Context) {
 	repo := ctx.Repo.Repository
-	sha := ctx.FormString("sha")
-	redirect := ctx.FormString("redirect")
+	commitID := ctx.FormString("commit_id")
 
-	commitStatuses, err := git_model.GetLatestCommitStatus(ctx, repo.ID, sha, db.ListOptionsAll)
+	commitStatuses, err := git_model.GetLatestCommitStatus(ctx, repo.ID, commitID, db.ListOptionsAll)
 	if err != nil {
 		ctx.ServerError("GetLatestCommitStatus", err)
 		return
@@ -862,7 +861,7 @@ func ApproveAllChecks(ctx *context_module.Context) {
 	}
 
 	if len(runIndexes) == 0 {
-		ctx.Redirect(redirect)
+		ctx.JSONOK()
 		return
 	}
 
@@ -872,7 +871,7 @@ func ApproveAllChecks(ctx *context_module.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("actions.approve_all_success"))
-	ctx.Redirect(redirect)
+	ctx.JSONOK()
 }
 
 func DisableWorkflowFile(ctx *context_module.Context) {

routers/web/repo/pull.go

@@ -317,7 +317,7 @@ type pullCommitStatusCheckData struct {
 	IsContextRequired     func(string) bool
 	RequireApproval       bool
 	CanApprove            bool
-	ApproveActionLink     string
+	ApproveLink           string
 }
 
 // prepareViewPullInfo show meta information for a pull request preview page
@@ -466,7 +466,7 @@ func prepareViewPullInfo(ctx *context.Context, issue *issues_model.Issue) *pull_
 	}
 
 	statusCheckData := &pullCommitStatusCheckData{
-		ApproveActionLink: fmt.Sprintf("%s/actions/approve-all-checks?sha=%s&redirect=%s", repo.Link(), sha, issue.Link()),
+		ApproveLink: fmt.Sprintf("%s/actions/approve-all-checks?commit_id=%s", repo.Link(), sha),
 	}
 	ctx.Data["StatusCheckData"] = statusCheckData
 

templates/repo/pulls/status.tmpl

@@ -7,7 +7,7 @@
 	* IsContextRequired: function to check whether a context is required
 	* RequireApproval: whether approval is required for workflow runs
 	* CanApprove: whether the user can approve workflow runs
-	* ApproveActionLink: link to approve all checks
+	* ApproveLink: link to approve all checks
 */}}
 
 {{if .CommitStatus}}
@@ -29,12 +29,9 @@
 
 		<div class="ui right">
 			{{if and .StatusCheckData .StatusCheckData.RequireApproval .StatusCheckData.CanApprove}}
-				<form method="post" action="{{.StatusCheckData.ApproveActionLink}}">
-					{{ctx.RootData.CsrfTokenHtml}}
-					<button type="submit" class="ui basic small compact button">
-						{{ctx.Locale.Tr "repo.pulls.status_checks_approve_all"}}
-					</button>
-				</form>
+				<button class="ui basic small compact button link-action" data-url="{{.StatusCheckData.ApproveLink}}">
+					{{ctx.Locale.Tr "repo.pulls.status_checks_approve_all"}}
+				</button>
 			{{end}}
 			{{if .ShowHideChecks}}
 				<button class="commit-status-hide-checks btn interact-fg"

tests/integration/actions_approve_test.go

@@ -112,26 +112,26 @@ jobs:
 		req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", baseRepo.OwnerName, baseRepo.Name, apiPull.Index))
 		resp = user4Session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc := NewHTMLParser(t, resp.Body)
-		assert.Zero(t, htmlDoc.doc.Find(".commit-status-header form").Length())
+		assert.Zero(t, htmlDoc.doc.Find(".commit-status-header button.link-action").Length())
 
 		// user2 can see the approve button
 		req = NewRequest(t, "GET", fmt.Sprintf("/%s/%s/pulls/%d", baseRepo.OwnerName, baseRepo.Name, apiPull.Index))
 		resp = user2Session.MakeRequest(t, req, http.StatusOK)
 		htmlDoc = NewHTMLParser(t, resp.Body)
-		formAction, exist := htmlDoc.doc.Find(".commit-status-header form").Attr("action")
+		dataURL, exist := htmlDoc.doc.Find(".commit-status-header button.link-action").Attr("data-url")
 		assert.True(t, exist)
 		assert.Equal(t,
-			fmt.Sprintf("%s/actions/approve-all-checks?sha=%s&redirect=/%s/%s/pulls/%d",
-				baseRepo.Link(), apiPull.Head.Sha, baseRepo.OwnerName, baseRepo.Name, apiPull.Index),
-			formAction,
+			fmt.Sprintf("%s/actions/approve-all-checks?commit_id=%s",
+				baseRepo.Link(), apiPull.Head.Sha),
+			dataURL,
 		)
 
 		// user2 approves all runs
-		req = NewRequestWithValues(t, "POST", formAction,
+		req = NewRequestWithValues(t, "POST", dataURL,
 			map[string]string{
 				"_csrf": GetUserCSRFToken(t, user2Session),
 			})
-		user2Session.MakeRequest(t, req, http.StatusSeeOther)
+		user2Session.MakeRequest(t, req, http.StatusOK)
 
 		// check runs
 		run1 = unittest.AssertExistsAndLoadBean(t, &actions_model.ActionRun{ID: run1.ID})