From 291a61bc8d5f7c8531b4dbb63aacf5938daab88f Mon Sep 17 00:00:00 2001 From: Gopesh Tulsyan Date: Mon, 16 Jun 2014 19:46:18 +0530 Subject: [PATCH] Adds splash check to todo list Adds specs for make_conference_public --- app/models/conference.rb | 1 + .../admin/conference/_todo_list.html.haml | 3 +++ app/views/home/_conference_details.html.haml | 5 +++-- spec/models/conference_spec.rb | 21 +++++++++++++------ 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/app/models/conference.rb b/app/models/conference.rb index 133c9a3d..43e7e4b9 100644 --- a/app/models/conference.rb +++ b/app/models/conference.rb @@ -283,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 diff --git a/app/views/admin/conference/_todo_list.html.haml b/app/views/admin/conference/_todo_list.html.haml index db6cf8db..3f87ecbd 100644 --- a/app/views/admin/conference/_todo_list.html.haml +++ b/app/views/admin/conference/_todo_list.html.haml @@ -27,3 +27,6 @@ %li{'class'=>class_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']) + %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']) diff --git a/app/views/home/_conference_details.html.haml b/app/views/home/_conference_details.html.haml index 335b25ed..25320002 100644 --- a/app/views/home/_conference_details.html.haml +++ b/app/views/home/_conference_details.html.haml @@ -21,7 +21,8 @@ .col-md-2 .btn-group-vertical - 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.user_registered?(current_user) = 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 = link_to "View My Proposals", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default" - elsif conference.cfp_open? - = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default" \ No newline at end of file + = link_to "Submit Proposal", conference_proposal_index_path(conference.short_title), :class =>"btn btn-default" diff --git a/spec/models/conference_spec.rb b/spec/models/conference_spec.rb index 31948ee9..13aad3c2 100644 --- a/spec/models/conference_spec.rb +++ b/spec/models/conference_spec.rb @@ -594,6 +594,7 @@ describe Conference do @result['tracks'] = true @result['event_types'] = true @result['difficulty_levels'] = true + @result['make_conference_public'] = true # Setup negative result hash @result_false = Hash.new @@ -613,6 +614,7 @@ describe Conference do subject.tracks = [] subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false expect(subject.get_status).to eq(@result_false) end @@ -625,9 +627,10 @@ describe Conference do subject.tracks = [] subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['registration'] = true - @result_false['process'] = 14.to_s + @result_false['process'] = 13.to_s expect(subject.get_status).to eq(@result_false) end @@ -640,10 +643,11 @@ describe Conference do subject.tracks = [] subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['cfp'] = 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) end @@ -657,11 +661,12 @@ describe Conference do subject.tracks = [] subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['cfp'] = true @result_false['registration'] = 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) end @@ -675,12 +680,13 @@ describe Conference do subject.tracks = [] subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['cfp'] = true @result_false['registration'] = true @result_false['venue'] = 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) end @@ -694,13 +700,14 @@ describe Conference do subject.venue = create(:venue) subject.event_types = [] subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['cfp'] = true @result_false['registration'] = true @result_false['venue'] = true @result_false['rooms'] = 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) end @@ -715,6 +722,7 @@ describe Conference do subject.call_for_papers = create(:call_for_papers) subject.venue = create(:venue) subject.difficulty_levels = [] + subject.make_conference_public = false @result_false['cfp'] = true @result_false['registration'] = true @@ -722,7 +730,7 @@ describe Conference do @result_false['rooms'] = true @result_false['tracks'] = 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) end @@ -737,6 +745,7 @@ describe Conference do subject.venue = create(:venue) subject.call_for_papers = create(:call_for_papers) subject.venue = create(:venue) + subject.make_conference_public = true expect(subject.get_status).to eq(@result) end