Adds splash check to todo list
Adds specs for make_conference_public
This commit is contained in:
parent
e1b7067fd9
commit
291a61bc8d
4 changed files with 22 additions and 8 deletions
|
|
@ -283,6 +283,7 @@ class Conference < ActiveRecord::Base
|
||||||
result['tracks'] = tracks_set?
|
result['tracks'] = tracks_set?
|
||||||
result['event_types'] = event_types_set?
|
result['event_types'] = event_types_set?
|
||||||
result['difficulty_levels'] = difficulty_levels_set?
|
result['difficulty_levels'] = difficulty_levels_set?
|
||||||
|
result['make_conference_public'] = make_conference_public?
|
||||||
result['process'] = calculate_setup_progress(result)
|
result['process'] = calculate_setup_progress(result)
|
||||||
result['short_title'] = short_title
|
result['short_title'] = short_title
|
||||||
result
|
result
|
||||||
|
|
|
||||||
|
|
@ -27,3 +27,6 @@
|
||||||
%li{'class'=>class_for_todo(conference_progress['difficulty_levels'])}
|
%li{'class'=>class_for_todo(conference_progress['difficulty_levels'])}
|
||||||
%span{'class'=>icon_for_todo(conference_progress['difficulty_levels'])}
|
%span{'class'=>icon_for_todo(conference_progress['difficulty_levels'])}
|
||||||
= link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
|
= link_to 'Add difficulty levels', admin_conference_difficulty_levels_path(conference_progress['short_title'])
|
||||||
|
%li{class: class_for_todo(conference_progress['make_conference_public'])}
|
||||||
|
%span{'class'=>icon_for_todo(conference_progress['make_conference_public'])}
|
||||||
|
= link_to 'Make Splash Page Public for Visitors', edit_admin_conference_path(conference_progress['short_title'])
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,8 @@
|
||||||
.col-md-2
|
.col-md-2
|
||||||
.btn-group-vertical
|
.btn-group-vertical
|
||||||
- if !@conference || @conference != conference
|
- if !@conference || @conference != conference
|
||||||
= link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
|
- if conference.make_conference_public?
|
||||||
|
= link_to "View Conference", conference_path(conference.short_title), :class =>"btn btn-default"
|
||||||
- if conference.registration_open?
|
- if conference.registration_open?
|
||||||
- if conference.user_registered?(current_user)
|
- if conference.user_registered?(current_user)
|
||||||
= link_to "Modify Registration", register_conference_path(conference.short_title), :class =>"btn btn-default"
|
= link_to "Modify Registration", register_conference_path(conference.short_title), :class =>"btn btn-default"
|
||||||
|
|
@ -31,4 +32,4 @@
|
||||||
- if !current_user.nil? && current_user.person.proposal_count(conference) > 0
|
- if !current_user.nil? && current_user.person.proposal_count(conference) > 0
|
||||||
= link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
|
= link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
|
||||||
- elsif conference.cfp_open?
|
- elsif conference.cfp_open?
|
||||||
= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
|
= link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default"
|
||||||
|
|
|
||||||
|
|
@ -594,6 +594,7 @@ describe Conference do
|
||||||
@result['tracks'] = true
|
@result['tracks'] = true
|
||||||
@result['event_types'] = true
|
@result['event_types'] = true
|
||||||
@result['difficulty_levels'] = true
|
@result['difficulty_levels'] = true
|
||||||
|
@result['make_conference_public'] = true
|
||||||
|
|
||||||
# Setup negative result hash
|
# Setup negative result hash
|
||||||
@result_false = Hash.new
|
@result_false = Hash.new
|
||||||
|
|
@ -613,6 +614,7 @@ describe Conference do
|
||||||
subject.tracks = []
|
subject.tracks = []
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -625,9 +627,10 @@ describe Conference do
|
||||||
subject.tracks = []
|
subject.tracks = []
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
@result_false['process'] = 14.to_s
|
@result_false['process'] = 13.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -640,10 +643,11 @@ describe Conference do
|
||||||
subject.tracks = []
|
subject.tracks = []
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['cfp'] = true
|
@result_false['cfp'] = true
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
@result_false['process'] = 29.to_s
|
@result_false['process'] = 25.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -657,11 +661,12 @@ describe Conference do
|
||||||
subject.tracks = []
|
subject.tracks = []
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['cfp'] = true
|
@result_false['cfp'] = true
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
@result_false['venue'] = true
|
@result_false['venue'] = true
|
||||||
@result_false['process'] = 43.to_s
|
@result_false['process'] = 38.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -675,12 +680,13 @@ describe Conference do
|
||||||
subject.tracks = []
|
subject.tracks = []
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['cfp'] = true
|
@result_false['cfp'] = true
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
@result_false['venue'] = true
|
@result_false['venue'] = true
|
||||||
@result_false['rooms'] = true
|
@result_false['rooms'] = true
|
||||||
@result_false['process'] = 57.to_s
|
@result_false['process'] = 50.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -694,13 +700,14 @@ describe Conference do
|
||||||
subject.venue = create(:venue)
|
subject.venue = create(:venue)
|
||||||
subject.event_types = []
|
subject.event_types = []
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['cfp'] = true
|
@result_false['cfp'] = true
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
@result_false['venue'] = true
|
@result_false['venue'] = true
|
||||||
@result_false['rooms'] = true
|
@result_false['rooms'] = true
|
||||||
@result_false['tracks'] = true
|
@result_false['tracks'] = true
|
||||||
@result_false['process'] = 71.to_s
|
@result_false['process'] = 63.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -715,6 +722,7 @@ describe Conference do
|
||||||
subject.call_for_papers = create(:call_for_papers)
|
subject.call_for_papers = create(:call_for_papers)
|
||||||
subject.venue = create(:venue)
|
subject.venue = create(:venue)
|
||||||
subject.difficulty_levels = []
|
subject.difficulty_levels = []
|
||||||
|
subject.make_conference_public = false
|
||||||
|
|
||||||
@result_false['cfp'] = true
|
@result_false['cfp'] = true
|
||||||
@result_false['registration'] = true
|
@result_false['registration'] = true
|
||||||
|
|
@ -722,7 +730,7 @@ describe Conference do
|
||||||
@result_false['rooms'] = true
|
@result_false['rooms'] = true
|
||||||
@result_false['tracks'] = true
|
@result_false['tracks'] = true
|
||||||
@result_false['event_types'] = true
|
@result_false['event_types'] = true
|
||||||
@result_false['process'] = 86.to_s
|
@result_false['process'] = 75.to_s
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result_false)
|
expect(subject.get_status).to eq(@result_false)
|
||||||
end
|
end
|
||||||
|
|
@ -737,6 +745,7 @@ describe Conference do
|
||||||
subject.venue = create(:venue)
|
subject.venue = create(:venue)
|
||||||
subject.call_for_papers = create(:call_for_papers)
|
subject.call_for_papers = create(:call_for_papers)
|
||||||
subject.venue = create(:venue)
|
subject.venue = create(:venue)
|
||||||
|
subject.make_conference_public = true
|
||||||
|
|
||||||
expect(subject.get_status).to eq(@result)
|
expect(subject.get_status).to eq(@result)
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue