app/models/school.rb in hackathon_manager-0.6.6 vs app/models/school.rb in hackathon_manager-0.7.0

- old
+ new

@@ -9,15 +9,21 @@ belongs_to :bus_list, optional: true def full_name out = "" out << name - if city.present? || state.present? + if full_location.present? out << " in " - out << city if city.present? - out << ", " if city.present? && state.present? - out << state if state.present? + out << full_location end + out + end + + def full_location + out = "" + out << city if city.present? + out << ", " if city.present? && state.present? + out << state if state.present? out end def bus_list return unless bus_list_id