From 40ab48325e765a309d9eaad3f1d318611ffa342b Mon Sep 17 00:00:00 2001 From: Go MAEDA Date: Sun, 8 Jun 2025 02:12:29 +0000 Subject: [PATCH] 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 --- app/helpers/queries_helper.rb | 2 +- app/models/user_preference.rb | 2 +- 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