From ba3a3a70867a6e399b54449b914ba5e5e54ea3f0 Mon Sep 17 00:00:00 2001
From: Excellencedev <ademiluyisuccessandexcellence@gmail.com>
Date: Wed, 7 Jan 2026 04:49:51 +0100
Subject: [PATCH] Feedback

---
 models/repo/repo_unit.go                     |  4 ++--
 options/locale/locale_en-US.json             |  4 ++--
 routers/web/org/setting/actions.go           | 15 ++++++++-------
 routers/web/repo/setting/actions.go          |  2 +-
 routers/web/web.go                           | 15 ++++++++++-----
 services/actions/permission_parser.go        |  2 +-
 templates/org/settings/actions_general.tmpl  | 10 +++++-----
 templates/repo/settings/actions_general.tmpl | 11 +++++------
 8 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/models/repo/repo_unit.go b/models/repo/repo_unit.go
index e5c1ec65bf8..ccbe462ce74 100644
--- a/models/repo/repo_unit.go
+++ b/models/repo/repo_unit.go
@@ -183,7 +183,7 @@ const (
 // ActionsTokenPermissions defines the permissions for different repository units
 type ActionsTokenPermissions struct {
 	// Code (repository code) - read/write/none
-	Code perm.AccessMode `json:"contents"`
+	Code perm.AccessMode `json:"code"`
 	// Issues - read/write/none
 	Issues perm.AccessMode `json:"issues"`
 	// PullRequests - read/write/none
@@ -206,7 +206,7 @@ func (p ActionsTokenPermissions) HasAccess(scope string, required perm.AccessMod
 	switch scope {
 	case "actions":
 		mode = p.Actions
-	case "contents":
+	case "code":
 		mode = p.Code
 	case "issues":
 		mode = p.Issues
diff --git a/options/locale/locale_en-US.json b/options/locale/locale_en-US.json
index 60e2d58553f..42e2f170a3c 100644
--- a/options/locale/locale_en-US.json
+++ b/options/locale/locale_en-US.json
@@ -3741,8 +3741,8 @@
   "actions.general.token_permissions.access_none": "None",
   "actions.general.token_permissions.access_read": "Read",
   "actions.general.token_permissions.access_write": "Write",
-  "actions.general.token_permissions.contents": "Code",
-  "actions.general.token_permissions.contents.description": "Repository contents, commits, branches, downloads, releases, and merges.",
+  "actions.general.token_permissions.code": "Code",
+  "actions.general.token_permissions.code.description": "Repository contents, commits, branches, downloads, releases, and merges.",
   "actions.general.token_permissions.issues": "Issues",
   "actions.general.token_permissions.issues.description": "Issues and related comments, assignees, labels, and milestones.",
   "actions.general.token_permissions.pull_requests": "Pull Requests",
diff --git a/routers/web/org/setting/actions.go b/routers/web/org/setting/actions.go
index 43fc4febce3..4a835664a33 100644
--- a/routers/web/org/setting/actions.go
+++ b/routers/web/org/setting/actions.go
@@ -18,8 +18,8 @@ const (
 	tplSettingsActionsGeneral templates.TplName = "org/settings/actions_general"
 )
 
-// ActionsGeneral renders the actions general settings page
-func ActionsGeneral(ctx *context.Context) {
+// ActionsGeneralSettings renders the actions general settings page
+func ActionsGeneralSettings(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("actions.actions")
 	ctx.Data["PageIsOrgSettings"] = true
 	ctx.Data["PageIsOrgSettingsActionsGeneral"] = true
@@ -58,12 +58,13 @@ func ActionsGeneral(ctx *context.Context) {
 		}
 	}
 	ctx.Data["AllowedRepos"] = allowedRepos
+	ctx.Data["Link"] = ctx.Org.OrgLink + "/settings/actions/general"
 
 	ctx.HTML(http.StatusOK, tplSettingsActionsGeneral)
 }
 
-// ActionsGeneralPost responses for actions general settings page
-func ActionsGeneralPost(ctx *context.Context) {
+// UpdateTokenPermissions responses for actions general settings page
+func UpdateTokenPermissions(ctx *context.Context) {
 	ctx.Data["Title"] = ctx.Tr("actions.actions")
 	ctx.Data["PageIsOrgSettings"] = true
 	ctx.Data["PageIsOrgSettingsActions"] = true
@@ -97,7 +98,7 @@ func ActionsGeneralPost(ctx *context.Context) {
 		}
 
 		actionsCfg.MaxTokenPermissions = &repo_model.ActionsTokenPermissions{
-			Code:         parseMaxPerm("contents"),
+			Code:         parseMaxPerm("code"),
 			Issues:       parseMaxPerm("issues"),
 			Packages:     parseMaxPerm("packages"),
 			PullRequests: parseMaxPerm("pull_requests"),
@@ -130,7 +131,7 @@ func ActionsGeneralPost(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("org.settings.update_setting_success"))
-	ctx.Redirect(ctx.Org.OrgLink + "/settings/actions")
+	ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/general")
 }
 
 // ActionsAllowedReposAdd adds a repository to the allowed list for cross-repo access
@@ -177,7 +178,7 @@ func ActionsAllowedReposAdd(ctx *context.Context) {
 	}
 
 	ctx.Flash.Success(ctx.Tr("repo.settings.update_settings_success"))
-	ctx.Redirect(ctx.Org.OrgLink + "/settings/actions")
+	ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/general")
 }
 
 // ActionsAllowedReposRemove removes a repository from the allowed list
diff --git a/routers/web/repo/setting/actions.go b/routers/web/repo/setting/actions.go
index cd974c23715..59d5b4f160b 100644
--- a/routers/web/repo/setting/actions.go
+++ b/routers/web/repo/setting/actions.go
@@ -178,7 +178,7 @@ func UpdateTokenPermissions(ctx *context.Context) {
 		}
 
 		actionsCfg.MaxTokenPermissions = &repo_model.ActionsTokenPermissions{
-			Code:         parseMaxPerm("contents"),
+			Code:         parseMaxPerm("code"),
 			Issues:       parseMaxPerm("issues"),
 			Packages:     parseMaxPerm("packages"),
 			PullRequests: parseMaxPerm("pull_requests"),
diff --git a/routers/web/web.go b/routers/web/web.go
index 9a704a16eab..53f78c504b0 100644
--- a/routers/web/web.go
+++ b/routers/web/web.go
@@ -959,11 +959,16 @@ func registerWebRoutes(m *web.Router) {
 				})
 
 				m.Group("/actions", func() {
-					m.Get("", org_setting.ActionsGeneral)
-					m.Post("", org_setting.ActionsGeneralPost)
-					m.Group("/allowed_repos", func() {
-						m.Post("/add", org_setting.ActionsAllowedReposAdd)
-						m.Post("/remove", org_setting.ActionsAllowedReposRemove)
+					m.Get("", func(ctx *context.Context) {
+						ctx.Redirect(ctx.Org.OrgLink + "/settings/actions/general")
+					})
+					m.Group("/general", func() {
+						m.Get("", org_setting.ActionsGeneralSettings)
+						m.Post("", org_setting.UpdateTokenPermissions)
+						m.Group("/allowed_repos", func() {
+							m.Post("/add", org_setting.ActionsAllowedReposAdd)
+							m.Post("/remove", org_setting.ActionsAllowedReposRemove)
+						})
 					})
 					addSettingsRunnersRoutes()
 					addSettingsSecretsRoutes()
diff --git a/services/actions/permission_parser.go b/services/actions/permission_parser.go
index 47edec689a5..57cf13003dc 100644
--- a/services/actions/permission_parser.go
+++ b/services/actions/permission_parser.go
@@ -109,7 +109,7 @@ func parseRawPermissions(rawPerms *yaml.Node, defaultPerms repo_model.ActionsTok
 
 			// Map GitHub Actions scopes to Gitea units
 			switch scope {
-			case "contents":
+			case "code":
 				result.Code = accessMode
 			case "issues":
 				result.Issues = accessMode
diff --git a/templates/org/settings/actions_general.tmpl b/templates/org/settings/actions_general.tmpl
index 50bb00e443e..0e38c0bdfb4 100644
--- a/templates/org/settings/actions_general.tmpl
+++ b/templates/org/settings/actions_general.tmpl
@@ -132,24 +132,24 @@
 				<tbody>
 					<tr>
 						<td>
-							<strong>{{ctx.Locale.Tr "actions.general.token_permissions.contents"}}</strong>
-							<p class="text small grey">{{ctx.Locale.Tr "actions.general.token_permissions.contents.description"}}</p>
+							<strong>{{ctx.Locale.Tr "actions.general.token_permissions.code"}}</strong>
+							<p class="text small grey">{{ctx.Locale.Tr "actions.general.token_permissions.code.description"}}</p>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="none" {{if not ($.MaxTokenPermissions.HasRead "contents")}}checked{{end}}>
+								<input type="radio" name="max_code" value="none" {{if not ($.MaxTokenPermissions.HasRead "code")}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="read" {{if and ($.MaxTokenPermissions.HasRead "contents") (not ($.MaxTokenPermissions.HasWrite "contents"))}}checked{{end}}>
+								<input type="radio" name="max_code" value="read" {{if and ($.MaxTokenPermissions.HasRead "code") (not ($.MaxTokenPermissions.HasWrite "code"))}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="write" {{if $.MaxTokenPermissions.HasWrite "contents"}}checked{{end}}>
+								<input type="radio" name="max_code" value="write" {{if $.MaxTokenPermissions.HasWrite "code"}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>
diff --git a/templates/repo/settings/actions_general.tmpl b/templates/repo/settings/actions_general.tmpl
index 9c31fb02c7a..c0a2a4c76ee 100644
--- a/templates/repo/settings/actions_general.tmpl
+++ b/templates/repo/settings/actions_general.tmpl
@@ -97,26 +97,25 @@
 				</thead>
 				<tbody>
 					<!-- Code -->
-					<tr>
 						<td>
-							<strong>{{ctx.Locale.Tr "actions.general.token_permissions.contents"}}</strong>
-							<p class="text small grey">{{ctx.Locale.Tr "actions.general.token_permissions.contents.description"}}</p>
+							<strong>{{ctx.Locale.Tr "actions.general.token_permissions.code"}}</strong>
+							<p class="text small grey">{{ctx.Locale.Tr "actions.general.token_permissions.code.description"}}</p>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="none" {{if not ($.MaxTokenPermissions.HasRead "contents")}}checked{{end}}>
+								<input type="radio" name="max_code" value="none" {{if not ($.MaxTokenPermissions.HasRead "code")}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="read" {{if and ($.MaxTokenPermissions.HasRead "contents") (not ($.MaxTokenPermissions.HasWrite "contents"))}}checked{{end}}>
+								<input type="radio" name="max_code" value="read" {{if and ($.MaxTokenPermissions.HasRead "code") (not ($.MaxTokenPermissions.HasWrite "code"))}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>
 						<td style="text-align: center">
 							<div class="ui radio checkbox">
-								<input type="radio" name="max_contents" value="write" {{if $.MaxTokenPermissions.HasWrite "contents"}}checked{{end}}>
+								<input type="radio" name="max_code" value="write" {{if $.MaxTokenPermissions.HasWrite "code"}}checked{{end}}>
 								<label></label>
 							</div>
 						</td>