use ctx.JSON

Author: Zettat123

routers/web/repo/setting/actions.go

@@ -69,14 +69,13 @@ func ActionsUnitPost(ctx *context.Context) {
 }
 
 func AddCollaborativeOwner(ctx *context.Context) {
-	redirectURL := ctx.Repo.RepoLink + "/settings/actions/general"
 	name := strings.ToLower(ctx.FormString("collaborative_owner"))
 
 	ownerID, err := user_model.GetUserOrOrgIDByName(ctx, name)
 	if err != nil {
 		if errors.Is(err, util.ErrNotExist) {
 			ctx.Flash.Error(ctx.Tr("form.user_not_exist"))
-			ctx.Redirect(redirectURL)
+			ctx.JSONErrorNotFound()
 		} else {
 			ctx.ServerError("GetUserOrOrgIDByName", err)
 		}
@@ -95,11 +94,10 @@ func AddCollaborativeOwner(ctx *context.Context) {
 		return
 	}
 
-	ctx.Redirect(redirectURL)
+	ctx.JSONOK()
 }
 
 func DeleteCollaborativeOwner(ctx *context.Context) {
-	redirectURL := ctx.Repo.RepoLink + "/settings/actions/general"
 	ownerID := ctx.FormInt64("id")
 
 	actionsUnit, err := ctx.Repo.Repository.GetUnit(ctx, unit_model.TypeActions)
@@ -110,7 +108,7 @@ func DeleteCollaborativeOwner(ctx *context.Context) {
 	actionsCfg := actionsUnit.ActionsConfig()
 	if !actionsCfg.IsCollaborativeOwner(ownerID) {
 		ctx.Flash.Error(ctx.Tr("actions.general.collaborative_owner_not_exist"))
-		ctx.Redirect(redirectURL)
+		ctx.JSONErrorNotFound()
 		return
 	}
 	actionsCfg.RemoveCollaborativeOwner(ownerID)
@@ -119,5 +117,5 @@ func DeleteCollaborativeOwner(ctx *context.Context) {
 		return
 	}
 
-	ctx.JSONRedirect(redirectURL)
+	ctx.JSONOK()
 }

templates/repo/settings/actions_general.tmpl

@@ -42,17 +42,19 @@
 					</div>
 				</div>
 				<div class="flex-item-trailing">
-					<button class="ui red tiny button inline delete-button" data-url="{{$.Link}}/collaborative_owner/delete" data-id="{{.ID}}">
-						{{ctx.Locale.Tr "remove"}}
-					</button>
+					<button class="ui red tiny button inline link-action" 
+						data-url="{{$.Link}}/collaborative_owner/delete?id={{.ID}}"
+						data-modal-confirm-header="{{ctx.Locale.Tr "actions.general.remove_collaborative_owner"}}"
+						data-modal-confirm-content="{{ctx.Locale.Tr "actions.general.remove_collaborative_owner_desc"}}"
+					>{{ctx.Locale.Tr "remove"}}</button>
 				</div>
 			</div>
 			{{end}}
 		</div>
 	</div>
 	{{end}}
 	<div class="ui bottom attached segment">
-		<form class="ui form" action="{{.Link}}/collaborative_owner/add" method="post">
+		<form class="ui form form-fetch-action" action="{{.Link}}/collaborative_owner/add" method="post">
 			{{.CsrfTokenHtml}}
 			<div id="search-user-box" class="ui search input tw-align-middle" data-include-orgs="true">
 				<input class="prompt" name="collaborative_owner" placeholder="{{ctx.Locale.Tr "search.user_kind"}}" autocomplete="off" autofocus required>
@@ -65,14 +67,3 @@
 	{{end}}
 	{{end}}
 </div>
-
-<div class="ui g-modal-confirm delete modal">
-	<div class="header">
-		{{svg "octicon-trash"}}
-		{{ctx.Locale.Tr "actions.general.remove_collaborative_owner"}}
-	</div>
-	<div class="content">
-		<p>{{ctx.Locale.Tr "actions.general.remove_collaborative_owner_desc"}}</p>
-	</div>
-	{{template "base/modal_actions_confirm" .}}
-</div>

tests/integration/actions_settings_test.go

@@ -40,7 +40,7 @@ func TestActionsCollaborativeOwner(t *testing.T) {
 			"_csrf":               GetUserCSRFToken(t, user2Session),
 			"collaborative_owner": user10.Name,
 		})
-		user2Session.MakeRequest(t, req, http.StatusSeeOther)
+		user2Session.MakeRequest(t, req, http.StatusOK)
 
 		// the git clone will be successful
 		doGitClone(dstPath, u)(t)