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

Final fixes for the day

Browse Source
This commit is contained in:
Godwin 2014-07-06 21:46:09 -06:00
parent cb44f3d53b
commit 6435e99deb
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/conferences_controller.rb
View File

@ -177,7 +177,9 @@ class ConferencesController < ApplicationController
# Use callbacks to share common setup or constraints between actions. # Use callbacks to share common setup or constraints between actions.
def set_conference def set_conference
@conference = nil @conference = nil
if type = ConferenceType.find_by!(slug: params[:conference_type_slug] || 'bikebike') puts ' ---------------------- '
puts params
if type = ConferenceType.find_by!(slug: params[:conference_type] || params[:conference_type_slug] || 'bikebike')
if @conference = Conference.find_by!(slug: params[:conference_slug] || params[:slug], conference_type_id: type.id) if @conference = Conference.find_by!(slug: params[:conference_slug] || params[:slug], conference_type_id: type.id)
set_conference_registration set_conference_registration
end end

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

@ -4,4 +4,4 @@
= tabs! = tabs!
%h2=('About '+@conference.title) %h2=('About '+@conference.title)
%p=@conference.info %p=@conference.info.html_safe