diff --git a/Gemfile b/Gemfile index 9f5136476..cf4a2dc23 100644 --- a/Gemfile +++ b/Gemfile @@ -103,7 +103,7 @@ group :development do gem "pronto-eslint", "~> 0.11.1", require: false gem "pronto-rubocop", "~> 0.11.6", require: false gem "pronto-stylelint", "~> 0.11.1", require: false - gem "rubocop", "~> 1.76.1", require: false + gem "rubocop", "~> 1.81.7", require: false gem "rubocop-capybara", "~> 2.22.1", require: false gem "rubocop-factory_bot", "~> 2.27.1", require: false gem "rubocop-performance", "~> 1.26.1", require: false diff --git a/Gemfile.lock b/Gemfile.lock index 427ed19a6..1abfcf21a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -625,7 +625,7 @@ GEM rspec-mocks (~> 3.13) rspec-support (~> 3.13) rspec-support (3.13.2) - rubocop (1.76.1) + rubocop (1.81.7) json (~> 2.3) language_server-protocol (~> 3.17.0.2) lint_roller (~> 1.1.0) @@ -633,7 +633,7 @@ GEM parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) regexp_parser (>= 2.9.3, < 3.0) - rubocop-ast (>= 1.45.0, < 2.0) + rubocop-ast (>= 1.47.1, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 4.0) rubocop-ast (1.47.1) @@ -889,7 +889,7 @@ DEPENDENCIES rinku (~> 2.0.6) ros-apartment (~> 3.2.0) rspec-rails (~> 7.1.1) - rubocop (~> 1.76.1) + rubocop (~> 1.81.7) rubocop-capybara (~> 2.22.1) rubocop-factory_bot (~> 2.27.1) rubocop-performance (~> 1.26.1) diff --git a/app/controllers/concerns/search.rb b/app/controllers/concerns/search.rb index d29f5b044..022890155 100644 --- a/app/controllers/concerns/search.rb +++ b/app/controllers/concerns/search.rb @@ -42,7 +42,7 @@ module Search end def search_finish_date - (params[:advanced_search][:date_max].to_date rescue Date.current) || Date.current + params[:advanced_search][:date_max].to_date rescue Date.current || Date.current end def search_date_range diff --git a/app/helpers/budgets_helper.rb b/app/helpers/budgets_helper.rb index 7ad8d9a52..8d5bfdbc7 100644 --- a/app/helpers/budgets_helper.rb +++ b/app/helpers/budgets_helper.rb @@ -16,7 +16,7 @@ module BudgetsHelper Budget::Ballot.find_by(user: current_user, budget: @budget) end - def unfeasible_or_unselected_filter + def unfeasible_or_unselected_filter? ["unselected", "unfeasible"].include?(@current_filter) end diff --git a/app/helpers/proposals_dashboard_helper.rb b/app/helpers/proposals_dashboard_helper.rb index dfac3b52f..57e14d6a5 100644 --- a/app/helpers/proposals_dashboard_helper.rb +++ b/app/helpers/proposals_dashboard_helper.rb @@ -89,9 +89,8 @@ module ProposalsDashboardHelper end def new_resources_since_last_login?(resources, new_actions_since_last_login) - if resources.present? + resources.present? && resources.ids.any? { |id| new_actions_since_last_login.include?(id) } - end end def active_resources_for(proposal) diff --git a/app/views/budgets/investments/index.html.erb b/app/views/budgets/investments/index.html.erb index fe9e97b71..bdc4b8470 100644 --- a/app/views/budgets/investments/index.html.erb +++ b/app/views/budgets/investments/index.html.erb @@ -45,7 +45,7 @@ <%= render Shared::AdvancedSearchComponent.new %> - <% if unfeasible_or_unselected_filter %> + <% if unfeasible_or_unselected_filter? %>