big-bro-watches-everything/devstar
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixbug

repo.diff.browse_source
This commit is contained in:
nimesulide
2025-11-12 13:25:17 +08:00
repo.diff.parent 96e707b80f
repo.diff.commit 597f156cee
repo.diff.stats_desc%!(EXTRA int=7, int=10, int=10)
repo.diff.download_patch repo.diff.download_diff Expand all files Collapse all files

1
models/user/user.go
repo.diff.view_file

@@ -675,6 +675,7 @@ func createUser(ctx context.Context, u *User, meta *Meta, createdByAdmin bool, o
u.Visibility = setting.Service.DefaultUserVisibilityMode
u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization && !setting.Admin.DisableRegularOrgCreation
u.AllowCreateDevcontainer = setting.Service.DefaultAllowCreateDevcontainer
u.AllowCreateActRunner = setting.Service.DefaultAllowCreateActRunner
u.EmailNotificationsPreference = setting.Admin.DefaultEmailNotification
u.MaxRepoCreation = -1
u.Theme = setting.UI.DefaultTheme

2
modules/setting/service.go
repo.diff.view_file

@@ -72,6 +72,7 @@ var Service = struct {
DefaultKeepEmailPrivate bool
DefaultAllowCreateOrganization bool
DefaultAllowCreateDevcontainer bool
DefaultAllowCreateActRunner bool
DefaultUserIsRestricted bool
EnableTimetracking bool
DefaultEnableTimetracking bool
@@ -207,6 +208,7 @@ func loadServiceFrom(rootCfg ConfigProvider) {
Service.DefaultKeepEmailPrivate = sec.Key("DEFAULT_KEEP_EMAIL_PRIVATE").MustBool()
Service.DefaultAllowCreateOrganization = sec.Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").MustBool(true)
Service.DefaultAllowCreateDevcontainer = sec.Key("DEFAULT_ALLOW_CREATE_DEVCONTAINER").MustBool(true)
Service.DefaultAllowCreateActRunner = sec.Key("DEFAULT_ALLOW_CREATE_ACTRUNNER").MustBool(false)
Service.DefaultUserIsRestricted = sec.Key("DEFAULT_USER_IS_RESTRICTED").MustBool(false)
Service.EnableTimetracking = sec.Key("ENABLE_TIMETRACKING").MustBool(true)
if Service.EnableTimetracking {

2
routers/install/install.go
repo.diff.view_file

@@ -156,6 +156,7 @@ func Install(ctx *context.Context) {
form.DefaultKeepEmailPrivate = setting.Service.DefaultKeepEmailPrivate
form.DefaultAllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization
form.DefaultAllowCreateDevcontainer = setting.Service.DefaultAllowCreateDevcontainer
form.DefaultAllowCreateActRunner = setting.Service.DefaultAllowCreateActRunner
form.DefaultEnableTimetracking = setting.Service.DefaultEnableTimetracking
form.NoReplyAddress = setting.Service.NoReplyAddress
form.PasswordAlgorithm = hash.ConfigHashAlgorithm(setting.PasswordHashAlgo)
@@ -492,6 +493,7 @@ func SubmitInstall(ctx *context.Context) {
cfg.Section("service").Key("DEFAULT_KEEP_EMAIL_PRIVATE").SetValue(strconv.FormatBool(form.DefaultKeepEmailPrivate))
cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_ORGANIZATION").SetValue(strconv.FormatBool(form.DefaultAllowCreateOrganization))
cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_DEVCONTAINER").SetValue(strconv.FormatBool(form.DefaultAllowCreateDevcontainer))
cfg.Section("service").Key("DEFAULT_ALLOW_CREATE_ACTRUNNER").SetValue(strconv.FormatBool(form.DefaultAllowCreateActRunner))
cfg.Section("service").Key("DEFAULT_ENABLE_TIMETRACKING").SetValue(strconv.FormatBool(form.DefaultEnableTimetracking))
cfg.Section("service").Key("NO_REPLY_ADDRESS").SetValue(form.NoReplyAddress)
cfg.Section("cron.update_checker").Key("ENABLED").SetValue(strconv.FormatBool(form.EnableUpdateChecker))

1
services/forms/user_form.go
repo.diff.view_file

@@ -62,6 +62,7 @@ type InstallForm struct {
DefaultKeepEmailPrivate bool
DefaultAllowCreateOrganization bool
DefaultAllowCreateDevcontainer bool
DefaultAllowCreateActRunner bool
DefaultEnableTimetracking bool
EnableUpdateChecker bool
NoReplyAddress string

2
templates/admin/config.tmpl
repo.diff.view_file

@@ -155,6 +155,8 @@
<dd>{{svg (Iif .Service.DefaultAllowCreateOrganization "octicon-check" "octicon-x")}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.default_allow_create_devcontainer"}}</dt>
<dd>{{svg (Iif .Service.DefaultAllowCreateDevcontainer "octicon-check" "octicon-x")}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.default_allow_create_actrunner"}}</dt>
<dd>{{svg (Iif .Service.DefaultAllowCreateActRunner "octicon-check" "octicon-x")}}</dd>
<dt>{{ctx.Locale.Tr "admin.config.enable_timetracking"}}</dt>
<dd>{{svg (Iif .Service.EnableTimetracking "octicon-check" "octicon-x")}}</dd>
{{if .Service.EnableTimetracking}}

2
templates/admin/user/edit.tmpl
repo.diff.view_file

@@ -158,7 +158,7 @@
<div class="inline field">
<div class="ui checkbox">
<label><strong>{{ctx.Locale.Tr "admin.users.allow_create_actrunner"}}</strong></label>
<input name="allow_create_actrunner" type="checkbox" {{if or (.User.IsAdmin) (.User.AllowCreateActrunner)}}checked{{end}}>
<input name="allow_create_actrunner" type="checkbox" {{if .User.AllowCreateActRunner}}checked{{end}}>
</div>
</div>

10
templates/shared/actions/runner_list.tmpl
repo.diff.view_file

@@ -9,15 +9,7 @@
{{svg "octicon-triangle-down" 14 "dropdown icon"}}
</button>
<div class="menu">
<div style="color: red; border: 1px solid red; padding: 10px; margin: 10px 0;">
<h4>权限调试信息：</h4>
<div>当前用户: {{if .Doer}}{{.Doer.Name}}{{else}}未登录{{end}}</div>
<div>AllowCreateActRunner: {{.AllowCreateActRunner}}</div>
<div>Permission.IsAdmin: {{.Permission.IsAdmin}}</div>
<div>or条件结果: {{or .AllowCreateActRunner .Permission.IsAdmin}}</div>
<div>Doer对象: {{printf "%+v" .Doer}}</div>
</div>
{{if (.Permission.IsAdmin)}}
{{if or (.AllowCreateActRunner) (.Permission.IsAdmin)}}
<div class="item">
<a href="{{$.Link}}/regist_runner">{{ctx.Locale.Tr "actions.runners.regist_runner"}}</a>
</div>