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

Remove equal from check if conference is over

Browse source
This commit is contained in:
selini 2017-04-25 19:50:14 +03:00 • committed by Alator
parent cb71b72e13
commit b53b7b2eb3
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

12
app/views/admin/conferences/_todo_list.html.haml
View file

@ -15,7 +15,7 @@
= link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title']) = link_to 'Set up registration period', new_admin_conference_registration_period_path(conference_progress['short_title'])
- else - else
Set up registration period 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']) } %span{ 'class' => icon_for_todo(conference_progress['cfp']) }
- if can? :update, Cfp.new(program_id: @program.id) - 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']) = link_to 'Set up call for papers', admin_conference_program_cfp_path(conference_progress['short_title'])
@ -32,31 +32,31 @@
- else - else
- @conference.reload - @conference.reload
Add venue 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']) } %span{ 'class' => icon_for_todo(conference_progress['rooms']) }
- if @conference.venue && (can? :update, @conference.venue.rooms.build) - if @conference.venue && (can? :update, @conference.venue.rooms.build)
= link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title']) = link_to 'Add rooms', admin_conference_venue_rooms_path(conference_progress['short_title'])
- else - else
Add rooms 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']) } %span{ 'class' => icon_for_todo(conference_progress['tracks']) }
- if can? :update, @conference.program.tracks.build - if can? :update, @conference.program.tracks.build
= link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title']) = link_to 'Add tracks', admin_conference_program_tracks_path(conference_progress['short_title'])
- else - else
Add tracks 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']) } %span{ 'class' => icon_for_todo(conference_progress['event_types']) }
- if can? :update, @conference.program.event_types.build - if can? :update, @conference.program.event_types.build
= link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title']) = link_to 'Add event types', admin_conference_program_event_types_path(conference_progress['short_title'])
- else - else
Add event types 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']) } %span{ 'class' => icon_for_todo(conference_progress['difficulty_levels']) }
- if can? :update, @conference.program.difficulty_levels.build - if can? :update, @conference.program.difficulty_levels.build
= link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title']) = link_to 'Add difficulty levels', admin_conference_program_difficulty_levels_path(conference_progress['short_title'])
- else - else
Add difficulty levels 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']) } %span{ 'class' => icon_for_todo(conference_progress['splashpage']) }
- if can? :update, @conference - if can? :update, @conference
= link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title']) = link_to 'Set up a Splashpage', admin_conference_splashpage_path(conference_progress['short_title'])

4
app/views/admin/conferences/show.html.haml
View file

@ -101,11 +101,11 @@
.row .row
.col-md-8 .col-md-8
%ul.nav.nav-tabs#recentTable %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' } %a{ href: '#recent_reg', 'data-toggle' => 'tab' }
%span.fa.fa-user %span.fa.fa-user
Recent Registrations 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' } %a{ href: '#recent_submissions', 'data-toggle' => 'tab' }
%span.fa.fa-file-text %span.fa.fa-file-text
Recent Submissions Recent Submissions