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

Merge 5b3b054d0b into 05209260a4

Browse source
This commit is contained in:
Christopher Byrd 2017-03-10 16:41:28 +00:00 • committed by GitHub
commit 75dc414dda
6 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/admin/conferences_controller.rb
View file

@ -167,7 +167,7 @@ module Admin
def edit
@conferences = Conference.all
@date_string = date_string(@conference.start_date, @conference.end_date)
@date_string = @conference.date_range_string
respond_to do |format|
format.html
format.json { render json: @conference.to_json }

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

@ -13,7 +13,7 @@
= "#{@conference.venue.street},"
= "#{@conference.venue.city} / #{@conference.venue.country_name}."
%small
= date_string(@conference.start_date, @conference.end_date)
= @conference.date_range_string
.row
.col-md-12
%h4

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

@ -9,7 +9,7 @@
= conference.title
%small
%b
= date_string(conference.start_date, conference.end_date)
= conference.date_range_string
- if conference.venue
%p
= "#{conference.venue.city}/#{conference.venue.country_name}"

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

@ -27,7 +27,7 @@
= "#{@conference.venue.city} / #{@conference.venue.country_name}"
- if @conference.start_date && @conference.end_date
%br
= date_string(@conference.start_date, @conference.end_date)
= @conference.date_range_string
- unless @conference.description.blank?
%section#about