Get rules by id when editing branch protection rule

modules/structs/repo_branch.go

@@ -25,6 +25,7 @@ type BranchProtection struct {
 	// Deprecated: true
 	BranchName                    string   `json:"branch_name"`
 	RuleName                      string   `json:"rule_name"`
+	RuleID                        string   `json:"rule_id"`
 	EnablePush                    bool     `json:"enable_push"`
 	EnablePushWhitelist           bool     `json:"enable_push_whitelist"`
 	PushWhitelistUsernames        []string `json:"push_whitelist_usernames"`

routers/web/repo/setting_protected_branch.go

@@ -166,10 +166,12 @@ func SettingsProtectedBranchPost(ctx *context.Context) {
 	}
 
 	var err error
-	protectBranch, err = git_model.GetProtectedBranchRuleByName(ctx, ctx.Repo.Repository.ID, f.RuleName)
-	if err != nil {
-		ctx.ServerError("GetProtectBranchOfRepoByName", err)
-		return
+	if f.RuleID > 0 {
+		protectBranch, err = git_model.GetProtectedBranchRuleByID(ctx, ctx.Repo.Repository.ID, f.RuleID)
+		if err != nil {
+			ctx.ServerError("GetProtectedBranchRuleByID", err)
+			return
+		}
 	}
 	if protectBranch == nil {
 		// No options found, create defaults.

services/forms/repo_form.go

@@ -190,6 +190,7 @@ func (f *RepoSettingForm) Validate(req *http.Request, errs binding.Errors) bindi
 // ProtectBranchForm form for changing protected branch settings
 type ProtectBranchForm struct {
 	RuleName                      string `binding:"Required"`
+	RuleID                        int64
 	EnablePush                    string
 	WhitelistUsers                string
 	WhitelistTeams                string

templates/swagger/v1_json.tmpl

@@ -14498,6 +14498,10 @@
           "format": "int64",
           "x-go-name": "RequiredApprovals"
         },
+        "rule_id": {
+          "type": "string",
+          "x-go-name": "RuleID"
+        },
         "rule_name": {
           "type": "string",
           "x-go-name": "RuleName"