diff --git a/.ruby-version b/.ruby-version index a9cadc6..6d5369b 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -ruby-3.2.0 +ruby-3.3.4 diff --git a/Gemfile b/Gemfile index 45a5913..3c61f52 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source "https://rubygems.org" -ruby "3.2.0" +ruby "3.3.4" # Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main" gem "rails", "~> 7.1.3", ">= 7.1.3.2" diff --git a/Gemfile.lock b/Gemfile.lock index 5bf55db..0e31210 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -289,7 +289,7 @@ DEPENDENCIES web-console RUBY VERSION - ruby 3.2.0p0 + ruby 3.3.4p94 BUNDLED WITH - 2.5.6 + 2.5.17 diff --git a/app/controllers/tables_arrangements_controller.rb b/app/controllers/tables_arrangements_controller.rb index d2fd9ac..7d3c371 100644 --- a/app/controllers/tables_arrangements_controller.rb +++ b/app/controllers/tables_arrangements_controller.rb @@ -5,6 +5,8 @@ class TablesArrangementsController < ApplicationController def show @tables_arrangement = TablesArrangement.find(params[:id]) - @seats = @tables_arrangement.seats.includes(:guest).group_by(&:table_number) + @seats = @tables_arrangement.seats + .includes(guest: %i[affinity_groups unbreakable_bonds]) + .group_by(&:table_number) end end diff --git a/app/views/tables_arrangements/show.html.erb b/app/views/tables_arrangements/show.html.erb index f43b80d..a2b9aae 100644 --- a/app/views/tables_arrangements/show.html.erb +++ b/app/views/tables_arrangements/show.html.erb @@ -10,7 +10,7 @@