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

Merge pull request #247 from gopesht/add_splash_dashboard

Browse source 
Adds Splash Checkbox in Conference Settings
This commit is contained in:
James Mason 2014-06-19 10:08:22 -07:00
commit 47777dbb4c
11 changed files with 55 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/models/conference.rb
View file

@ -19,7 +19,8 @@ class Conference < ActiveRecord::Base
:lodging_description, :include_registrations_in_splash,
:include_sponsors_in_splash, :include_tracks_in_splash,
:include_tickets_in_splash, :include_social_media_in_splash,
:include_program_in_splash
:include_program_in_splash, :make_conference_public
has_paper_trail
@ -282,6 +283,7 @@ class Conference < ActiveRecord::Base
result['tracks'] = tracks_set?
result['event_types'] = event_types_set?
result['difficulty_levels'] = difficulty_levels_set?
result['make_conference_public'] = make_conference_public?
result['process'] = calculate_setup_progress(result)
result['short_title'] = short_title
result