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

Fixes to do list link to registration period

Browse source 
fix #505
This commit is contained in:
Chrisbr 2014-10-04 09:30:56 +02:00
parent 9e499d2a5e
commit b6439a7ea0
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/views/admin/conference/_todo_list.html.haml
View file

@ -9,7 +9,10 @@
%li{'class'=>class_for_todo(conference_progress['registration'])} %li{'class'=>class_for_todo(conference_progress['registration'])}
%span{'class'=>icon_for_todo(conference_progress['registration'])} %span{'class'=>icon_for_todo(conference_progress['registration'])}
- if can? :update, @conference - if can? :update, @conference
= link_to 'Set up registration period', edit_admin_conference_registration_period_path(conference_progress['short_title']) - if conference.registration_period
= link_to 'Set up registration period', edit_admin_conference_registration_period_path(conference_progress['short_title'])
- else
= 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'=>class_for_todo(conference_progress['cfp'])} %li{'class'=>class_for_todo(conference_progress['cfp'])}

3
app/views/admin/conference/show.html.haml
View file

@ -55,7 +55,8 @@
x: @cfp_weeks, x: @cfp_weeks,
unit: 'weeks' } unit: 'weeks' }
.col-md-4 .col-md-4
= render partial: 'todo_list', locals: { conference_progress: @conference_progress } = render partial: 'todo_list', locals: { conference_progress: @conference_progress,
conference: @conference }
.row .row
.col-md-12#doughnut .col-md-12#doughnut
%ul.nav.nav-tabs#doughnut_tabs %ul.nav.nav-tabs#doughnut_tabs