From 09451a1df02f977854d8cd6c4211ed5ac5c09a4c Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Wed, 16 Oct 2024 23:46:53 +0000 Subject: [PATCH] Fix RuboCop offense Lint/SafeNavigationConsistency (#39887). git-svn-id: https://svn.redmine.org/redmine/trunk@23134 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/models/issue.rb | 2 +- app/models/journal.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)