Merge branch 'main' into ractors
Some checks failed
Run unit tests / unit_tests (pull_request) Failing after 2s
Some checks failed
Run unit tests / unit_tests (pull_request) Failing after 2s
This commit is contained in:
commit
f3d7f76e79
@ -1 +1 @@
|
|||||||
ruby-3.2.0
|
ruby-3.3.4
|
||||||
|
2
Gemfile
2
Gemfile
@ -1,6 +1,6 @@
|
|||||||
source "https://rubygems.org"
|
source "https://rubygems.org"
|
||||||
|
|
||||||
ruby "3.2.0"
|
ruby "3.3.4"
|
||||||
|
|
||||||
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
|
# Bundle edge Rails instead: gem "rails", github: "rails/rails", branch: "main"
|
||||||
gem "rails", "~> 7.1.3", ">= 7.1.3.2"
|
gem "rails", "~> 7.1.3", ">= 7.1.3.2"
|
||||||
|
@ -289,7 +289,7 @@ DEPENDENCIES
|
|||||||
web-console
|
web-console
|
||||||
|
|
||||||
RUBY VERSION
|
RUBY VERSION
|
||||||
ruby 3.2.0p0
|
ruby 3.3.4p94
|
||||||
|
|
||||||
BUNDLED WITH
|
BUNDLED WITH
|
||||||
2.5.6
|
2.5.17
|
||||||
|
@ -5,6 +5,8 @@ class TablesArrangementsController < ApplicationController
|
|||||||
|
|
||||||
def show
|
def show
|
||||||
@tables_arrangement = TablesArrangement.find(params[:id])
|
@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
|
||||||
end
|
end
|
||||||
|
@ -10,7 +10,7 @@
|
|||||||
|
|
||||||
<ul>
|
<ul>
|
||||||
<% seats.each do |seat| %>
|
<% seats.each do |seat| %>
|
||||||
<li><%= seat.guest.full_name %></li>
|
<li><%= seat.guest.full_name %> (<%= seat.guest.affinity_groups.pluck(:name).join(", ") %>)</li>
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
<% end %>
|
<% end %>
|
Loading…
x
Reference in New Issue
Block a user