fix

Author: wxiaoguang

models/user/email_notification.go

@@ -22,5 +22,8 @@ const (
 
 	SettingsKeyCodeViewShowFileTree = "code_view.show_file_tree"
 
-	SettingsEmailNotificationGiteaActions = "email_notifications.actions"
+	SettingsKeyEmailNotificationGiteaActions        = "email_notification.gitea_actions"
+	SettingEmailNotificationGiteaActionsAll         = "all"
+	SettingEmailNotificationGiteaActionsFailureOnly = "failure-only" // Default for actions email preference
+	SettingEmailNotificationGiteaActionsDisabled    = "disabled"
 )

models/user/setting_keys.go renamed to models/user/setting_options.go

@@ -798,10 +798,6 @@ func createUser(ctx context.Context, u *User, meta *Meta, createdByAdmin bool, o
 		return err
 	}
 
-	if err := SetUserSetting(ctx, u.ID, SettingsEmailNotificationGiteaActions, EmailNotificationGiteaActionsFailureOnly); err != nil {
-		return err
-	}
-
 	return committer.Commit()
 }
 

models/user/user.go

@@ -1021,8 +1021,8 @@ email_notifications.onmention = Only Email on Mention
 email_notifications.disable = Disable Email Notifications
 email_notifications.submit = Set Email Preference
 email_notifications.andyourown = And Your Own Notifications
-email_notifications.actions.desc = Notifications for workflow runs on repositories set up with <a target="_blank" rel="noopener noreferrer" href="%s">Gitea Actions</a>.
-email_notifications.actions.failureonly = Only notify for failed workflow runs
+email_notifications.actions.desc = Notifications for workflow runs on repositories set up with <a target="_blank" href="%s">Gitea Actions</a>.
+email_notifications.actions.failure_only = Only notify for failed workflow runs
 
 visibility = User visibility
 visibility.public = Public

options/locale/locale_en-US.ini

@@ -30,7 +30,7 @@ func Notifications(ctx *context.Context) {
 	ctx.Data["PageIsSettingsNotifications"] = true
 	ctx.Data["EmailNotificationsPreference"] = ctx.Doer.EmailNotificationsPreference
 
-	actionsEmailPref, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsEmailNotificationGiteaActions, user_model.EmailNotificationGiteaActionsFailureOnly)
+	actionsEmailPref, err := user_model.GetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyEmailNotificationGiteaActions, user_model.SettingEmailNotificationGiteaActionsFailureOnly)
 	if err != nil {
 		ctx.ServerError("GetUserSetting", err)
 		return
@@ -77,14 +77,14 @@ func NotificationsActionsEmailPost(ctx *context.Context) {
 	}
 
 	preference := ctx.FormString("preference")
-	if !(preference == user_model.EmailNotificationGiteaActionsAll ||
-		preference == user_model.EmailNotificationGiteaActionsDisabled ||
-		preference == user_model.EmailNotificationGiteaActionsFailureOnly) {
+	if !(preference == user_model.SettingEmailNotificationGiteaActionsAll ||
+		preference == user_model.SettingEmailNotificationGiteaActionsDisabled ||
+		preference == user_model.SettingEmailNotificationGiteaActionsFailureOnly) {
 		log.Error("Actions Email notifications preference change returned unrecognized option %s: %s", preference, ctx.Doer.Name)
 		ctx.ServerError("NotificationsActionsEmailPost", errors.New("option unrecognized"))
 		return
 	}
-	if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsEmailNotificationGiteaActions, preference); err != nil {
+	if err := user_model.SetUserSetting(ctx, ctx.Doer.ID, user_model.SettingsKeyEmailNotificationGiteaActions, preference); err != nil {
 		log.Error("Cannot set actions email notifications preference: %v", err)
 		ctx.ServerError("SetUserSetting", err)
 		return

routers/web/user/setting/notifications.go

@@ -150,12 +150,12 @@ func MailActionsTrigger(ctx context.Context, sender *user_model.User, repo *repo
 
 	if !sender.IsGiteaActions() && !sender.IsGhost() && sender.IsMailable() {
 		notifyPref, err := user_model.GetUserSetting(ctx, sender.ID,
-			user_model.SettingsEmailNotificationGiteaActions, user_model.EmailNotificationGiteaActionsFailureOnly)
+			user_model.SettingsKeyEmailNotificationGiteaActions, user_model.SettingEmailNotificationGiteaActionsFailureOnly)
 		if err != nil {
 			log.Error("GetUserSetting: %v", err)
 			return
 		}
-		if notifyPref == user_model.EmailNotificationGiteaActionsAll || !run.Status.IsSuccess() && notifyPref != user_model.EmailNotificationGiteaActionsDisabled {
+		if notifyPref == user_model.SettingEmailNotificationGiteaActionsAll || !run.Status.IsSuccess() && notifyPref != user_model.SettingEmailNotificationGiteaActionsDisabled {
 			recipients = append(recipients, sender)
 		}
 	}

services/mailer/mail_workflow_run.go

@@ -46,9 +46,9 @@
 								{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 								<div class="text"></div>
 								<div class="menu">
-									<div data-value="all" class="{{if eq .ActionsEmailNotificationsPreference "all"}}active selected {{end}}item">{{ctx.Locale.Tr "all"}}</div>
-									<div data-value="failureonly" class="{{if eq .ActionsEmailNotificationsPreference "failureonly"}}active selected {{end}}item">{{ctx.Locale.Tr "settings.email_notifications.actions.failureonly"}}</div>
-									<div data-value="disabled" class="{{if eq .ActionsEmailNotificationsPreference "disabled"}}active selected {{end}}item">{{ctx.Locale.Tr "disabled"}}</div>
+									<div data-value="all" class="item">{{ctx.Locale.Tr "all"}}</div>
+									<div data-value="failure-only" class="item">{{ctx.Locale.Tr "settings.email_notifications.actions.failure_only"}}</div>
+									<div data-value="disabled" class="item">{{ctx.Locale.Tr "disabled"}}</div>
 								</div>
 							</div>
 						</div>