From 02dd29f0651b10616f6d0d06f9b58dd18f99ca94 Mon Sep 17 00:00:00 2001
From: as-op <a.sandorf@openproject.com>
Date: Thu, 28 Nov 2024 12:08:03 +0100
Subject: [PATCH] obey rubocop

---
 .../app/controllers/cost_reports_controller.rb | 18 +++++++++---------
 .../cost_query/pdf/timesheet_generator.rb      |  4 ----
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/modules/reporting/app/controllers/cost_reports_controller.rb b/modules/reporting/app/controllers/cost_reports_controller.rb
index 62ca09c0d943..d66a649596ac 100644
--- a/modules/reporting/app/controllers/cost_reports_controller.rb
+++ b/modules/reporting/app/controllers/cost_reports_controller.rb
@@ -506,16 +506,16 @@ def prepare_query
   # Determine the query settings the current request and save it to
   # the session.
   def determine_settings
-    if force_default?
-      filters = default_filter_parameters
-      groups = default_group_parameters
-      session[session_name].try :delete, :name
-    else
-      filters = filter_params
-      groups = group_params
-    end
+    return reset_settings if force_default?
+
+    cookie = session[session_name] || {}
+    session[session_name] = cookie.merge(filters: filter_params, groups: group_params)
+  end
+
+  def reset_settings
+    session[session_name].try :delete, :name
     cookie = session[session_name] || {}
-    session[session_name] = cookie.merge(filters:, groups:)
+    session[session_name] = cookie.merge(filters: default_filter_parameters, groups: default_group_parameters)
   end
 
   ##
diff --git a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb
index aac8e33b6f19..6fe23c27c92a 100644
--- a/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb
+++ b/modules/reporting/app/workers/cost_query/pdf/timesheet_generator.rb
@@ -73,7 +73,6 @@ def all_entries
       .filter { |r| r.fields["type"] == "TimeEntry" }
   end
 
-  # rubocop:disable Metrics/AbcSize
   def build_table_rows(entries)
     rows = [table_header_columns]
     entries
@@ -85,8 +84,6 @@ def build_table_rows(entries)
     rows
   end
 
-  # rubocop:enable Metrics/AbcSize
-
   def build_table_day_rows(spent_on, lines)
     day_rows = []
     lines.each do |r|
@@ -188,7 +185,6 @@ def split_group_rows(table_rows)
     end
     groups
   end
-
   # rubocop:enable Metrics/AbcSize
 
   def write_table(user_id, entries)