Skip to content

Commit fe350ae

Browse files
lunnylunny
committed
Merge branch 'lunny/refactor_org_setting' of github.com:lunny/gitea into lunny/refactor_org_setting
2 parents 4db1324 + c2694d8 commit fe350ae

File tree

4 files changed

+35
-38
lines changed

4 files changed

+35
-38
lines changed

‎models/user/user.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -955,8 +955,8 @@ func UpdateUserCols(ctx context.Context, u *User, cols ...string) error {
955955
return err
956956
}
957957

958-
// UpdateUserColsNoAutotime update user according special columns
959-
func UpdateUserColsNoAutotime(ctx context.Context, u *User, cols ...string) error {
958+
// UpdateUserColsNoAutoTime update user according special columns
959+
func UpdateUserColsNoAutoTime(ctx context.Context, u *User, cols ...string) error {
960960
if err := ValidateUser(u, cols...); err != nil {
961961
return err
962962
}

‎services/org/org.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ func ChangeOrganizationVisibility(ctx context.Context, org *org_model.Organizati
155155
org.Visibility = visibility
156156
// FIXME: If it's a big forks network(forks and sub forks), the database transaction will be too long to fail.
157157
return db.WithTx(ctx, func(ctx context.Context) error {
158-
if err := user_model.UpdateUserColsNoAutotime(ctx, org.AsUser(), "visibility"); err != nil {
158+
if err := user_model.UpdateUserColsNoAutoTime(ctx, org.AsUser(), "visibility"); err != nil {
159159
return err
160160
}
161161

‎templates/org/settings/options_dangerzone.tmpl‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -40,32 +40,27 @@
4040
{{ctx.Locale.Tr "org.settings.change_visibility"}}
4141
</div>
4242
<div class="content">
43-
<ul class="ui warning message">
44-
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_1"}}</li>
45-
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_2"}}</li>
46-
</ul>
43+
<div class="ui warning message">
44+
<ul>
45+
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_1"}}</li>
46+
<li>{{ctx.Locale.Tr "org.settings.change_visibility_notices_2"}}</li>
47+
</ul>
48+
</div>
4749
<form class="ui form form-fetch-action" action="{{.Link}}/visibility" method="post">
4850
{{.CsrfTokenHtml}}
49-
50-
<div class="field">
51+
<div class="tw-flex tw-flex-col tw-gap-3">
5152
<label>{{ctx.Locale.Tr "org.settings.visibility"}}</label>
52-
<div class="field">
53-
<div class="ui radio checkbox">
54-
<input name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}>
55-
<label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
56-
</div>
53+
<div class="ui radio checkbox">
54+
<input name="visibility" type="radio" value="0" {{if eq .CurrentVisibility 0}}checked{{end}}>
55+
<label>{{ctx.Locale.Tr "org.settings.visibility.public"}}</label>
5756
</div>
58-
<div class="field">
59-
<div class="ui radio checkbox">
60-
<input name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}>
61-
<label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
62-
</div>
57+
<div class="ui radio checkbox">
58+
<input name="visibility" type="radio" value="1" {{if eq .CurrentVisibility 1}}checked{{end}}>
59+
<label>{{ctx.Locale.Tr "org.settings.visibility.limited"}}</label>
6360
</div>
64-
<div class="field">
65-
<div class="ui radio checkbox">
66-
<input name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}>
67-
<label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
68-
</div>
61+
<div class="ui radio checkbox">
62+
<input name="visibility" type="radio" value="2" {{if eq .CurrentVisibility 2}}checked{{end}}>
63+
<label>{{ctx.Locale.Tr "org.settings.visibility.private"}}</label>
6964
</div>
7065
</div>
7166

@@ -82,10 +77,12 @@
8277
{{ctx.Locale.Tr "org.settings.rename"}}
8378
</div>
8479
<div class="content">
85-
<ul class="ui warning message">
86-
<li>{{ctx.Locale.Tr "org.settings.rename_notices_1"}}</li>
87-
<li>{{ctx.Locale.Tr "org.settings.rename_notices_2"}}</li>
88-
</ul>
80+
<div class="ui warning message">
81+
<ul>
82+
<li>{{ctx.Locale.Tr "org.settings.rename_notices_1"}}</li>
83+
<li>{{ctx.Locale.Tr "org.settings.rename_notices_2"}}</li>
84+
</ul>
85+
</div>
8986
<form class="ui form form-fetch-action" action="{{.Link}}/rename" method="post">
9087
{{.CsrfTokenHtml}}
9188
<div class="field">
@@ -117,12 +114,14 @@
117114
{{ctx.Locale.Tr "org.settings.delete_account"}}
118115
</div>
119116
<div class="content">
120-
<ul class="ui warning message">
121-
<li>{{ctx.Locale.Tr "org.settings.delete_notices_1"}}</li>
122-
<li>{{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}</li>
123-
<li>{{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}</li>
124-
<li>{{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}</li>
125-
</ul>
117+
<div class="ui warning message">
118+
<ul>
119+
<li>{{ctx.Locale.Tr "org.settings.delete_notices_1"}}</li>
120+
<li>{{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}</li>
121+
<li>{{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}</li>
122+
<li>{{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}</li>
123+
</ul>
124+
</div>
126125
<form class="ui form form-fetch-action" action="{{.Link}}/delete" method="post">
127126
{{.CsrfTokenHtml}}
128127
<div class="field">

‎web_src/css/base.css‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -617,10 +617,8 @@ img.ui.avatar,
617617
}
618618

619619
.ui .message > ul {
620-
margin-left: auto;
621-
margin-right: auto;
622-
display: table;
623-
text-align: left;
620+
margin: 0;
621+
padding: 0 1em;
624622
}
625623

626624
.ui .header > i + .content {

0 commit comments

Comments
 (0)