From b53b7b2eb39bf53fc5ec37ec772fba3d1b5aae78 Mon Sep 17 00:00:00 2001 From: selini Date: Tue, 25 Apr 2017 19:50:14 +0300 Subject: [PATCH] Remove equal from check if conference is over --- app/views/admin/conferences/_todo_list.html.haml | 12 ++++++------ app/views/admin/conferences/show.html.haml | 4 ++-- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/views/admin/conferences/_todo_list.html.haml b/app/views/admin/conferences/_todo_list.html.haml index 45f7b1fe..70b543c5 100644 --- a/app/views/admin/conferences/_todo_list.html.haml +++ b/app/views/admin/conferences/_todo_list.html.haml @@ -15,7 +15,7 @@ = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title']) - else Set up registration period - %li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['cfp'])}" } + %li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['cfp'])}" } %span{ 'class' => icon_for_todo(conference_progress['cfp']) } - if can? :update, Cfp.new(program_id: @program.id) = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title']) @@ -32,31 +32,31 @@ - else - @conference.reload Add venue - %li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['rooms'])}" } + %li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['rooms'])}" } %span{ 'class' => icon_for_todo(conference_progress['rooms']) } - if @conference.venue && (can? :update, @conference.venue.rooms.build) = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title']) - else Add rooms - %li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['tracks'])}" } + %li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['tracks'])}" } %span{ 'class' => icon_for_todo(conference_progress['tracks']) } - if can? :update, @conference.program.tracks.build = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title']) - else Add tracks - %li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['event_types'])}" } + %li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['event_types'])}" } %span{ 'class' => icon_for_todo(conference_progress['event_types']) } - if can? :update, @conference.program.event_types.build = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title']) - else Add event types - %li{ 'class' => "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['difficulty_levels'])}" } + %li{ 'class' => "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['difficulty_levels'])}" } %span{ 'class' => icon_for_todo(conference_progress['difficulty_levels']) } - if can? :update, @conference.program.difficulty_levels.build = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title']) - else Add difficulty levels - %li{ class: "list-group-item #{ 'hidden' if Date.today >= conference.end_date } #{class_for_todo(conference_progress['splashpage'])}" } + %li{ class: "list-group-item #{ 'hidden' if Date.today > conference.end_date } #{class_for_todo(conference_progress['splashpage'])}" } %span{ 'class' => icon_for_todo(conference_progress['splashpage']) } - if can? :update, @conference = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title']) diff --git a/app/views/admin/conferences/show.html.haml b/app/views/admin/conferences/show.html.haml index 7d10c98b..d38592a2 100644 --- a/app/views/admin/conferences/show.html.haml +++ b/app/views/admin/conferences/show.html.haml @@ -101,11 +101,11 @@ .row .col-md-8 %ul.nav.nav-tabs#recentTable - %li{ 'class' => "active #{ 'hidden' if Date.today >= @conference.end_date }" } + %li{ 'class' => "active #{ 'hidden' if Date.today > @conference.end_date }" } %a{ href: '#recent_reg', 'data-toggle' => 'tab' } %span.fa.fa-user Recent Registrations - %li{ 'class' => "#{ 'hidden' if Date.today >= @conference.end_date }" } + %li{ 'class' => "#{ 'hidden' if Date.today > @conference.end_date }" } %a{ href: '#recent_submissions', 'data-toggle' => 'tab' } %span.fa.fa-file-text Recent Submissions