From c2694d8b49e58f6dc69eb678c184c38dc89fe898 Mon Sep 17 00:00:00 2001 From: wxiaoguang Date: Sun, 6 Jul 2025 13:29:06 +0800 Subject: [PATCH] fix --- models/user/user.go | 4 +- services/org/org.go | 2 +- .../org/settings/options_dangerzone.tmpl | 61 +++++++++---------- web_src/css/base.css | 6 +- 4 files changed, 35 insertions(+), 38 deletions(-) diff --git a/models/user/user.go b/models/user/user.go index 5dd9b8980f..449163ab0f 100644 --- a/models/user/user.go +++ b/models/user/user.go @@ -955,8 +955,8 @@ func UpdateUserCols(ctx context.Context, u *User, cols ...string) error { return err } -// UpdateUserColsNoAutotime update user according special columns -func UpdateUserColsNoAutotime(ctx context.Context, u *User, cols ...string) error { +// UpdateUserColsNoAutoTime update user according special columns +func UpdateUserColsNoAutoTime(ctx context.Context, u *User, cols ...string) error { if err := ValidateUser(u, cols...); err != nil { return err } diff --git a/services/org/org.go b/services/org/org.go index ffb0327d12..142a643f9f 100644 --- a/services/org/org.go +++ b/services/org/org.go @@ -155,7 +155,7 @@ func ChangeOrganizationVisibility(ctx context.Context, org *org_model.Organizati org.Visibility = visibility // 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 { - if err := user_model.UpdateUserColsNoAutotime(ctx, org.AsUser(), "visibility"); err != nil { + if err := user_model.UpdateUserColsNoAutoTime(ctx, org.AsUser(), "visibility"); err != nil { return err } diff --git a/templates/org/settings/options_dangerzone.tmpl b/templates/org/settings/options_dangerzone.tmpl index 396b061fc7..c21cbbde4b 100644 --- a/templates/org/settings/options_dangerzone.tmpl +++ b/templates/org/settings/options_dangerzone.tmpl @@ -40,32 +40,27 @@ {{ctx.Locale.Tr "org.settings.change_visibility"}}
- +
+
    +
  • {{ctx.Locale.Tr "org.settings.change_visibility_notices_1"}}
  • +
  • {{ctx.Locale.Tr "org.settings.change_visibility_notices_2"}}
  • +
+
{{.CsrfTokenHtml}} - -
+
-
-
- - -
+
+ +
-
-
- - -
+
+ +
-
-
- - -
+
+ +
@@ -82,10 +77,12 @@ {{ctx.Locale.Tr "org.settings.rename"}}
-
    -
  • {{ctx.Locale.Tr "org.settings.rename_notices_1"}}
  • -
  • {{ctx.Locale.Tr "org.settings.rename_notices_2"}}
  • -
+
+
    +
  • {{ctx.Locale.Tr "org.settings.rename_notices_1"}}
  • +
  • {{ctx.Locale.Tr "org.settings.rename_notices_2"}}
  • +
+
{{.CsrfTokenHtml}}
@@ -117,12 +114,14 @@ {{ctx.Locale.Tr "org.settings.delete_account"}}
-
    -
  • {{ctx.Locale.Tr "org.settings.delete_notices_1"}}
  • -
  • {{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}
  • -
  • {{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}
  • -
  • {{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}
  • -
+
+
    +
  • {{ctx.Locale.Tr "org.settings.delete_notices_1"}}
  • +
  • {{ctx.Locale.Tr "org.settings.delete_notices_2" .Org.Name}}
  • +
  • {{ctx.Locale.Tr "org.settings.delete_notices_3" .Org.Name}}
  • +
  • {{ctx.Locale.Tr "org.settings.delete_notices_4" .Org.Name}}
  • +
+
{{.CsrfTokenHtml}}
diff --git a/web_src/css/base.css b/web_src/css/base.css index 529ddd5386..90764f3e50 100644 --- a/web_src/css/base.css +++ b/web_src/css/base.css @@ -617,10 +617,8 @@ img.ui.avatar, } .ui .message > ul { - margin-left: auto; - margin-right: auto; - display: table; - text-align: left; + margin: 0; + padding: 0 1em; } .ui .header > i + .content {