From 7be67bf669c19392ac87dde15954a02dcfa1ce98 Mon Sep 17 00:00:00 2001 From: nimesulide Date: Wed, 12 Nov 2025 21:23:50 +0800 Subject: [PATCH] fixbug --- options/locale/locale_zh-CN.ini | 3 +++ routers/web/admin/users.go | 2 ++ services/forms/admin.go | 6 +++--- services/user/update.go | 3 ++- templates/install.tmpl | 6 ++++++ 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 92c5c19e13..36a66b76d2 100644 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -358,8 +358,10 @@ default_keep_email_private=默认情况下隐藏邮箱地址 default_keep_email_private_popup=默认情况下,隐藏新用户帐户的邮箱地址。 default_allow_create_organization=默认情况下允许创建组织 default_allow_create_devcontainer=默认情况下允许创建容器 +default_allow_create_actrunner=默认情况下允许创建运行器 default_allow_create_organization_popup=默认情况下, 允许新用户帐户创建组织。 default_allow_create_devcontainer_popup=默认情况下, 允许新用户帐户创建容器。 +default_allow_create_actrunner_popup=默认情况下, 允许新用户帐户创建运行器。 default_enable_timetracking=默认情况下启用时间跟踪 default_enable_timetracking_popup=默认情况下启用新仓库的时间跟踪。 no_reply_address=隐藏邮件域 @@ -3412,6 +3414,7 @@ config.reset_password_code_lives=恢复账户验证码过期时间 config.default_keep_email_private=默认隐藏邮箱地址 config.default_allow_create_organization=默认情况下允许创建组织 config.default_allow_create_devcontainer=默认情况下允许创建 DevContainer +config.default_allow_create_actrunner=默认情况下允许创建 ActRunner config.enable_timetracking=启用时间跟踪 config.default_enable_timetracking=默认情况下启用时间跟踪 config.default_allow_only_contributors_to_track_time=仅允许成员跟踪时间 diff --git a/routers/web/admin/users.go b/routers/web/admin/users.go index 363503d245..8e04b0f8e2 100644 --- a/routers/web/admin/users.go +++ b/routers/web/admin/users.go @@ -338,6 +338,8 @@ func EditUserPost(ctx *context.Context) { } form := web.GetForm(ctx).(*forms.AdminEditUserForm) + // TEMP LOG: dump received form values to help debug allow_create_actrunner binding + log.Info("AdminEditUserPost: received form values: AllowCreateActRunner=%v, AllowCreateDevcontainer=%v, AllowCreateOrganization=%v, Admin=%v, Active=%v, ProhibitLogin=%v", form.AllowCreateActRunner, form.AllowCreateDevcontainer, form.AllowCreateOrganization, form.Admin, form.Active, form.ProhibitLogin) if ctx.HasError() { ctx.HTML(http.StatusOK, tplUserEdit) return diff --git a/services/forms/admin.go b/services/forms/admin.go index bc49963dd1..abb4219964 100644 --- a/services/forms/admin.go +++ b/services/forms/admin.go @@ -48,9 +48,9 @@ type AdminEditUserForm struct { Restricted bool AllowGitHook bool AllowImportLocal bool - AllowCreateOrganization bool - AllowCreateDevcontainer bool - AllowCreateActRunner bool + AllowCreateOrganization bool `form:"allow_create_organization"` + AllowCreateDevcontainer bool `form:"allow_create_devcontainer"` + AllowCreateActRunner bool `form:"allow_create_actrunner"` ProhibitLogin bool Reset2FA bool `form:"reset_2fa"` Visibility structs.VisibleType diff --git a/services/user/update.go b/services/user/update.go index 80650b8d54..ae0e2c2431 100644 --- a/services/user/update.go +++ b/services/user/update.go @@ -174,7 +174,8 @@ func UpdateUser(ctx context.Context, u *user_model.User, opts *UpdateOptions) er if opts.AllowCreateActRunner.Has() { u.AllowCreateActRunner = opts.AllowCreateActRunner.Value() - cols = append(cols, "allow_create_actrunner") + // DB column name uses snake_case with underscore between "act" and "runner" + cols = append(cols, "allow_create_act_runner") } if opts.RepoAdminChangeTeamAccess.Has() { u.RepoAdminChangeTeamAccess = opts.RepoAdminChangeTeamAccess.Value() diff --git a/templates/install.tmpl b/templates/install.tmpl index 76a5ffdc82..a1526867b8 100644 --- a/templates/install.tmpl +++ b/templates/install.tmpl @@ -310,6 +310,12 @@ +
+
+ + +
+