gunghogeoduck/osem-fcy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Using new accessor for city, country_name, venue name & street

Browse source
This commit is contained in:
Espartaco Palma 2020-01-23 21:43:44 -08:00 • committed by Henne Vogelsang
parent fd2635509f
commit f5986f4160
No known key found for this signature in database
GPG key ID: 9D6164C2955FADE0
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/pdfs/ticket_pdf.rb
View file

@ -69,9 +69,9 @@ class TicketPdf < Prawn::Document
draw_text @conference.title.to_s, at: [@mid_horizontal + 30, cursor - 30], size: 12 draw_text @conference.title.to_s, at: [@mid_horizontal + 30, cursor - 30], size: 12
draw_text @conference.organization.name.to_s, at: [@mid_horizontal + 30, cursor - 50], size: 12 draw_text @conference.organization.name.to_s, at: [@mid_horizontal + 30, cursor - 50], size: 12
if @conference.venue if @conference.venue
draw_text @conference.venue.name, at: [@mid_horizontal + 30, cursor - 70] draw_text @conference.venue_name, at: [@mid_horizontal + 30, cursor - 70]
draw_text @conference.venue.street, at: [@mid_horizontal + 30, cursor - 90] draw_text @conference.venue_street, at: [@mid_horizontal + 30, cursor - 90]
draw_text @conference.venue.city, at: [@mid_horizontal + 30, cursor - 110] draw_text @conference.city, at: [@mid_horizontal + 30, cursor - 110]
end end
move_up 130 move_up 130
move_down @mid_vertical move_down @mid_vertical

6
app/views/conference_registrations/show.html.haml
View file

@ -9,9 +9,9 @@
-if @conference.venue -if @conference.venue
at at
%strong %strong
= "#{@conference.venue.name}," = "#{@conference.venue_name},"
= "#{@conference.venue.street}," = "#{@conference.venue_street},"
= "#{@conference.venue.city} / #{@conference.venue.country_name}." = "#{@conference.city} / #{@conference.country_name}."
%small %small
= date_string(@conference.start_date, @conference.end_date) = date_string(@conference.start_date, @conference.end_date)
- unless @conference.code_of_conduct.blank? - unless @conference.code_of_conduct.blank?

2
app/views/conferences/_conference_details.html.haml
View file

@ -12,7 +12,7 @@
= date_string(conference.start_date, conference.end_date) = date_string(conference.start_date, conference.end_date)
- if conference.venue - if conference.venue
%p %p
= "#{conference.venue.city}/#{conference.venue.country_name}" = "#{conference.city}/#{conference.country_name}"
- unless conference.description.blank? - unless conference.description.blank?
%p %p
= markdown(conference.description) = markdown(conference.description)

6
app/views/physical_tickets/show.html.haml
View file

@ -9,9 +9,9 @@
- if @conference.venue - if @conference.venue
at at
%strong %strong
#{@conference.venue.name}, #{@conference.venue_name},
#{@conference.venue.street}, #{@conference.venue_street},
#{@conference.venue.city} / #{@conference.venue.country_name}. #{@conference.city} / #{@conference.country_name}.
%small %small
= date_string(@conference.start_date, @conference.end_date) = date_string(@conference.start_date, @conference.end_date)
.row .row