Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Ability for User to Customize Email Notification Frequency #7813

Merged
merged 15 commits into from
Aug 29, 2019
Merged

Add Ability for User to Customize Email Notification Frequency #7813

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
fd51209
Add Backend Logic for Toggling Email Notification
gary-kim Aug 9, 2019
3a3e115
Add UI and complete user email notification enable
gary-kim Aug 15, 2019
564132f
Add Third Option for Only Email on Mention
gary-kim Aug 16, 2019
a21e094
Readd NOT NULL to new preference string
gary-kim Aug 19, 2019
1bdef76
Add Tests and Rewrite Comment
gary-kim Aug 23, 2019
c75d312
Allow admin to set default email frequency
gary-kim Aug 28, 2019
c99da37
Add new config option to docs
gary-kim Aug 28, 2019
9e211bb
Fix a few mistakes
gary-kim Aug 28, 2019
a43f8d0
Only update required columns
gary-kim Aug 28, 2019
f480285
Simplify an error check
lafriks Aug 28, 2019
33c833d
Make email_notification_preference column in DB be VARCHAR(20)
gary-kim Aug 29, 2019
7cace04
Handle errors
gary-kim Aug 29, 2019
fa5e8ae
Merge branch 'master' into enh/noid/disable-email-notifications
lafriks Aug 29, 2019
b883cbb
Update models/migrations/v93.go
gary-kim Aug 29, 2019
fe9ba4b
Merge branch 'master' into enh/noid/disable-email-notifications
lafriks Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Allow admin to set default email frequency 
Signed-off-by: Gary Kim <[email protected]>
  • Loading branch information
@gary-kim
gary-kim committed Aug 28, 2019
commit c75d31202e2ad28365d7b1b4d50da2f02265cd2a
2 changes: 2 additions & 0 deletions custom/conf/app.ini.sample
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@ MAX_FILE_SIZE = 1048576
[admin]
; Disallow regular (non-admin) users from creating organizations.
DISABLE_REGULAR_ORG_CREATION = false
; Default configuration for email notifications for users (user configurable). Options: enabled, onmention, disabled
DEFAULT_EMAIL_NOTIFICATIONS = enabled

[security]
; Whether the installer is disabled
Expand Down
1 change: 1 addition & 0 deletions models/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,7 @@ func CreateUser(u *User) (err error) {
}
u.HashPassword(u.Passwd)
u.AllowCreateOrganization = setting.Service.DefaultAllowCreateOrganization && !setting.Admin.DisableRegularOrgCreation
u.EmailNotificationsPreference = setting.Admin.DefaultEmailNotification
u.MaxRepoCreation = -1
u.Theme = setting.UI.DefaultTheme

Expand Down
4 changes: 4 additions & 0 deletions modules/setting/setting.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ var (
// Admin settings
Admin struct {
DisableRegularOrgCreation bool
DefaultEmailNotification string
}

// Picture settings
Expand Down Expand Up @@ -762,6 +763,9 @@ func NewContext() {
}
}

sec = Cfg.Section("admin")
Admin.DefaultEmailNotification = sec.Key("DEFAULT_EMAIL_NOTIFICATIONS").MustString("enabled")

sec = Cfg.Section("security")
InstallLock = sec.Key("INSTALL_LOCK").MustBool(false)
SecretKey = sec.Key("SECRET_KEY").MustString("!#@FDEWREWR&*(")
Expand Down