summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2025-06-08 02:12:29 +0000
committerGo MAEDA <maeda@farend.jp>2025-06-08 02:12:29 +0000
commit40ab48325e765a309d9eaad3f1d318611ffa342b (patch)
treec78906804b5efd9238a515175c8d69b16eb360cb
parentbb6b8e1e43b0412aa00b317c1827e1cf0caf96f1 (diff)
downloadredmine-40ab48325e765a309d9eaad3f1d318611ffa342b.tar.gz
redmine-40ab48325e765a309d9eaad3f1d318611ffa342b.zip
Replace nil check using ternary operator with safe navigation operator when accessing hashes (#41884).
Using the ternary operator for nil checking caused a runtime error in the Style/SafeNavigation cop during `rubocop --regenerate-todo` with RuboCop 1.76.0. Replacing it with the safe navigation operator avoids the error. git-svn-id: https://svn.redmine.org/redmine/trunk@23824 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/queries_helper.rb2
-rw-r--r--app/models/user_preference.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb
index ca7168f27..3aef7083a 100644
--- a/app/helpers/queries_helper.rb
+++ b/app/helpers/queries_helper.rb
@@ -169,7 +169,7 @@ module QueriesHelper
group_name = format_object(group)
end
group_name ||= ""
- group_count = result_count_by_group ? result_count_by_group[group] : nil
+ group_count = result_count_by_group&.[](group)
group_totals = totals_by_group.map {|column, t| total_tag(column, t[group] || 0)}.join(" ").html_safe
end
end
diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb
index 8b19d9a5a..e1842b131 100644
--- a/app/models/user_preference.rb
+++ b/app/models/user_preference.rb
@@ -73,7 +73,7 @@ class UserPreference < ApplicationRecord
if has_attribute? attr_name
super
else
- others ? others[attr_name] : nil
+ others&.[](attr_name)
end
end