form expect struct

Author: 6543

routers/web/repo/setting/protected_branch.go

@@ -322,10 +322,10 @@ func DeleteProtectedBranchRulePost(ctx *context.Context) {
 }
 
 func UpdateBranchProtectionPriories(ctx *context.Context) {
-	form := web.GetForm(ctx).([]int64)
+	form := web.GetForm(ctx).(*forms.ProtectBranchPriorityForm)
 	repo := ctx.Repo.Repository
 
-	if err := git_model.UpdateProtectBranchPriorities(ctx, repo, form); err != nil {
+	if err := git_model.UpdateProtectBranchPriorities(ctx, repo, form.IDS); err != nil {
 		ctx.ServerError("UpdateProtectBranchPriorities", err)
 		return
 	}

routers/web/web.go

@@ -1075,7 +1075,7 @@ func registerRoutes(m *web.Router) {
 			m.Combo("/edit").Get(repo_setting.SettingsProtectedBranch).
 				Post(web.Bind(forms.ProtectBranchForm{}), context.RepoMustNotBeArchived(), repo_setting.SettingsProtectedBranchPost)
 			m.Post("/{id}/delete", repo_setting.DeleteProtectedBranchRulePost)
-			m.Post("/priority", web.Bind([]int64{}), context.RepoMustNotBeArchived(), repo_setting.UpdateBranchProtectionPriories)
+			m.Post("/priority", web.Bind(forms.ProtectBranchPriorityForm{}), context.RepoMustNotBeArchived(), repo_setting.UpdateBranchProtectionPriories)
 		})
 
 		m.Group("/tags", func() {

services/forms/repo_form.go

@@ -227,6 +227,10 @@ func (f *ProtectBranchForm) Validate(req *http.Request, errs binding.Errors) bin
 	return middleware.Validate(errs, ctx.Data, f, ctx.Locale)
 }
 
+type ProtectBranchPriorityForm struct {
+	IDS []int64
+}
+
 //  __      __      ___.   .__                   __
 // /  \    /  \ ____\_ |__ |  |__   ____   ____ |  | __
 // \   \/\/   // __ \| __ \|  |  \ /  _ \ /  _ \|  |/ /

web_src/js/features/repo-settings-branches.ts

@@ -9,10 +9,16 @@ export function initRepoBranchesSettings() {
     handle: '.drag-handle',
     animation: 150,
     onEnd: async (evt) => {
-      const newOrder = Array.from(protectedBranchesList.children).map((item) => item.dataset.id);
+      const newOrder = Array.from(protectedBranchesList.children).map((item) => {
+        const id = item.dataset.id;
+        return id ? parseInt(id, 10) : NaN;
+      }).filter(id => !isNaN(id));
+
       try {
         await POST(protectedBranchesList.getAttribute('data-priority-url'), {
-          data: newOrder,
+          data: {
+            ids: newOrder,
+          },
         });
       } catch (err) {
         console.error('Failed to update branch protection rule priority:', err);