Mirrors/gitea
0
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-07-19 08:30:49 +02:00
Code Issues Activity

fix

Browse Source
This commit is contained in:
wxiaoguang 2025-07-06 13:29:06 +08:00
parent 0d0db1c752
commit c2694d8b49
4 changed files with 35 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
models/user/user.go
View File

@ -955,8 +955,8 @@ func UpdateUserCols(ctx context.Context, u *User, cols ...string) error {
return err return err
} }
// UpdateUserColsNoAutotime update user according special columns // UpdateUserColsNoAutoTime update user according special columns
func UpdateUserColsNoAutotime(ctx context.Context, u *User, cols ...string) error { func UpdateUserColsNoAutoTime(ctx context.Context, u *User, cols ...string) error {
if err := ValidateUser(u, cols...); err != nil { if err := ValidateUser(u, cols...); err != nil {
return err return err
} }

2
services/org/org.go
View File

@ -155,7 +155,7 @@ func ChangeOrganizationVisibility(ctx context.Context, org *org_model.Organizati
org.Visibility = visibility org.Visibility = visibility
// FIXME: If it's a big forks network(forks and sub forks), the database transaction will be too long to fail. // FIXME: If it's a big forks network(forks and sub forks), the database transaction will be too long to fail.
return db.WithTx(ctx, func(ctx context.Context) error { return db.WithTx(ctx, func(ctx context.Context) error {
if err := user_model.UpdateUserColsNoAutotime(ctx, org.AsUser(), "visibility"); err != nil { if err := user_model.UpdateUserColsNoAutoTime(ctx, org.AsUser(), "visibility"); err != nil {
return err return err
} }

61
templates/org/settings/options_dangerzone.tmpl
View File

@ -40,32 +40,27 @@
{{ctx.Locale.Tr "org.settings.change_visibility"}} {{ctx.Locale.Tr "org.settings.change_visibility"}}
</div> </div>
<div class="content"> <div class="content">
<ul class="ui warning message"> <div class="ui warning message">
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_1"}}</li> <ul>
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_2"}}</li> <li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_1"}}</li>
</ul> <li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_2"}}</li>
</ul>
</div>
<form class="ui form form-fetch-action" action="{{.Link}}/visibility" method="post"> <form class="ui form form-fetch-action" action="{{.Link}}/visibility" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="tw-flex tw-flex-col tw-gap-3">
<div class="field">
<label>{{ctx.Locale.Tr "org.settings.visibility"}}</label> <label>{{ctx.Locale.Tr "org.settings.visibility"}}</label>
<div class="field"> <div class="ui radio checkbox">
<div class="ui radio checkbox"> <input name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}>
<input name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}> <label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
<label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
</div>
</div> </div>
<div class="field"> <div class="ui radio checkbox">
<div class="ui radio checkbox"> <input name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}>
<input name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}> <label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
<label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
</div>
</div> </div>
<div class="field"> <div class="ui radio checkbox">
<div class="ui radio checkbox"> <input name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}>
<input name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}> <label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
<label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
</div>
</div> </div>
</div> </div>
@ -82,10 +77,12 @@
{{ctx.Locale.Tr "org.settings.rename"}} {{ctx.Locale.Tr "org.settings.rename"}}
</div> </div>
<div class="content"> <div class="content">
<ul class="ui warning message"> <div class="ui warning message">
<li>{{ctx.Locale.Tr "org.settings.rename_notices_1"}}</li> <ul>
<li>{{ctx.Locale.Tr "org.settings.rename_notices_2"}}</li> <li>{{ctx.Locale.Tr "org.settings.rename_notices_1"}}</li>
</ul> <li>{{ctx.Locale.Tr "org.settings.rename_notices_2"}}</li>
</ul>
</div>
<form class="ui form form-fetch-action" action="{{.Link}}/rename" method="post"> <form class="ui form form-fetch-action" action="{{.Link}}/rename" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field"> <div class="field">
@ -117,12 +114,14 @@
{{ctx.Locale.Tr "org.settings.delete_account"}} {{ctx.Locale.Tr "org.settings.delete_account"}}
</div> </div>
<div class="content"> <div class="content">
<ul class="ui warning message"> <div class="ui warning message">
<li>{{ctx.Locale.Tr "org.settings.delete_notices_1"}}</li> <ul>
<li>{{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}</li> <li>{{ctx.Locale.Tr "org.settings.delete_notices_1"}}</li>
<li>{{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}</li> <li>{{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}</li>
<li>{{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}</li> <li>{{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}</li>
</ul> <li>{{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}</li>
</ul>
</div>
<form class="ui form form-fetch-action" action="{{.Link}}/delete" method="post"> <form class="ui form form-fetch-action" action="{{.Link}}/delete" method="post">
{{.CsrfTokenHtml}} {{.CsrfTokenHtml}}
<div class="field"> <div class="field">

6
web_src/css/base.css
View File

@ -617,10 +617,8 @@ img.ui.avatar,
} }
.ui .message > ul { .ui .message > ul {
margin-left: auto; margin: 0;
margin-right: auto; padding: 0 1em;
display: table;
text-align: left;
} }
.ui .header > i + .content { .ui .header > i + .content {