bike/BikeBikeBike
1
0
Fork 0
Code Issues 4 Pull Requests Projects Releases Wiki Activity

Set location title to link text on the schedule (#263)

Browse Source 
* Added optional text attribute to location link

* Set location title to link text on the schedule
This commit is contained in:
Godwin 2017-08-22 12:24:41 -07:00 committed by GitHub
parent 3d02e09807
commit 5f2add7f64
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/helpers/geocoder_helper.rb
View File

@ -84,9 +84,13 @@ module GeocoderHelper
return hash.length > 1 ? _("geography.formats.#{hash.keys.join('_')}", locale: locale, vars: hash) : hash.values.first return hash.length > 1 ? _("geography.formats.#{hash.keys.join('_')}", locale: locale, vars: hash) : hash.values.first
end end
def location_link(location) def location_link(location, text = nil)
return '' unless location.present? return '' unless location.present?
address = if location.is_a?(Location) address = if text is_a?(Symbol)
location.send(text)
elsif location.is_a?(String)
text
elsif location.is_a?(Location)
location.street location.street
else else
location.address location.address

2
app/views/conference_administration/_schedule.html.haml
View File

@ -15,7 +15,7 @@
%tr %tr
%th.corner %th.corner
- data[:locations].each do |id, location| - data[:locations].each do |id, location|
%th.location-header=location.is_a?(Symbol) ? '' : location_link(location) %th.location-header=location.is_a?(Symbol) ? '' : location_link(location, :title)
%tbody %tbody
- data[:times].each do |time, time_data| - data[:times].each do |time, time_data|
%tr{class: "row-type-#{time_data[:type] || 'nil'}"} %tr{class: "row-type-#{time_data[:type] || 'nil'}"}