diff --git a/app/models/issue.rb b/app/models/issue.rb index 48a935558..980bd56f0 100644 --- a/app/models/issue.rb +++ b/app/models/issue.rb @@ -2071,7 +2071,7 @@ class Issue < ApplicationRecord def add_auto_watcher if author&.active? && - author&.allowed_to?(:add_issue_watchers, project) && + author.allowed_to?(:add_issue_watchers, project) && author.pref.auto_watch_on?('issue_created') && self.watcher_user_ids.exclude?(author.id) self.set_watcher(author, true) diff --git a/app/models/journal.rb b/app/models/journal.rb index 24c54544b..446eac7a6 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -339,7 +339,7 @@ class Journal < ApplicationRecord def add_watcher if user&.active? && - user&.allowed_to?(:add_issue_watchers, project) && + user.allowed_to?(:add_issue_watchers, project) && user.pref.auto_watch_on?('issue_contributed_to') && !Watcher.any_watched?(Array.wrap(journalized), user) journalized.set_watcher(user, true)