Merge branch 'development'
This commit is contained in:
commit
41b81e419f
@ -63,10 +63,11 @@
|
|||||||
- guests.each do |guest|
|
- guests.each do |guest|
|
||||||
%tr
|
%tr
|
||||||
%th=guest.user.name
|
%th=guest.user.name
|
||||||
|
%th=guest.user.email
|
||||||
%th=guest.from
|
%th=guest.from
|
||||||
%tr
|
%tr
|
||||||
- if guest.housing_data['other'].present?
|
- if guest.housing_data['other'].present?
|
||||||
%td{colspan: 2, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale}
|
%td{colspan: 3, lang: guest.user.locale.to_s == I18n.locale.to_s ? nil : guest.user.locale}
|
||||||
= paragraph guest.housing_data['other']
|
= paragraph guest.housing_data['other']
|
||||||
|
|
||||||
= row do
|
= row do
|
||||||
|
Loading…
x
Reference in New Issue
Block a user