From 4345df433a427c7a5446e567f6262aefde355c46 Mon Sep 17 00:00:00 2001 From: Nick Quaranto Date: Thu, 24 Apr 2014 18:59:53 -0500 Subject: [PATCH] Use to_param and allow songs with periods to be seen, closes #4 --- app/models/song.rb | 6 ++---- app/models/venue.rb | 1 + 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/song.rb b/app/models/song.rb index 2713254..128d6d1 100644 --- a/app/models/song.rb +++ b/app/models/song.rb @@ -5,6 +5,8 @@ class Song < ActiveRecord::Base has_many :setlists, through: :slots has_many :shows, -> { uniq }, through: :setlists + to_param :name + def debut_show performed_shows.last end @@ -13,10 +15,6 @@ def performed_shows @performed_shows ||= shows.performed end - def to_param - "#{id}-#{CGI.escape(name).downcase}" - end - def merge!(other_song) other_song.slots.each do |slot| slot.song = self diff --git a/app/models/venue.rb b/app/models/venue.rb index ce56c49..d7a08a1 100644 --- a/app/models/venue.rb +++ b/app/models/venue.rb @@ -1,6 +1,7 @@ class Venue < ActiveRecord::Base include Showable + to_param :name has_many :shows def merge!(other_venue)