Track related refactoring
Add roles as nested routes to track (for the track organizer role) Allow transition from to_accept to to_reject and backwards Split Track#valid_dates validation to many independent ones Show all the confirmed tracks in the conference's splashpage Add comment in admin/Tracks#toggle_cfp_inclusion Rewrite admin/TracksController#accept spec Add feature spec for track requests Change 'In' to 'Room' in Tracks#index Rewrite Track#overlapping Refactor code in ProposalsController Fix typos
This commit is contained in:
parent
9c4892bfc8
commit
27fa79a826
21 changed files with 279 additions and 144 deletions
|
|
@ -27,15 +27,17 @@
|
|||
= role.users.pluck(:name).first(5).join ', '
|
||||
- if role.users.count > 5
|
||||
- if role.resource_type == 'Track'
|
||||
= link_to '...', track_admin_conference_role_path(@conference.short_title, role.name, role.resource)
|
||||
= link_to '...', admin_conference_program_track_role_path(@conference.short_title, role.resource, role.name)
|
||||
- else
|
||||
= link_to '...', admin_conference_role_path(@conference.short_title, role.name)
|
||||
%td
|
||||
.btn-group
|
||||
- if role.resource_type == 'Track'
|
||||
= link_to 'Users', track_admin_conference_role_path(@conference.short_title, role.name, role.resource), class: 'btn btn-success'
|
||||
= link_to 'Users', admin_conference_program_track_role_path(@conference.short_title, role.resource, role.name),
|
||||
class: 'btn btn-success'
|
||||
- if can? :edit, role
|
||||
= link_to 'Edit', track_edit_admin_conference_role_path(@conference.short_title, role.name, role.resource), class: 'btn btn-primary'
|
||||
= link_to 'Edit', edit_admin_conference_program_track_role_path(@conference.short_title, role.resource, role.name),
|
||||
class: 'btn btn-primary'
|
||||
- else
|
||||
= link_to 'Users', admin_conference_role_path(@conference.short_title, role.name), class: 'btn btn-success'
|
||||
- if can? :edit, role
|
||||
|
|
|
|||
|
|
@ -7,7 +7,8 @@
|
|||
= @role.name.titleize
|
||||
- if can? :edit, @role
|
||||
- if @track
|
||||
= link_to 'Edit', track_edit_admin_conference_role_path(@conference.short_title, @role.name, @track), class: 'btn btn-primary pull-right'
|
||||
= link_to 'Edit', edit_admin_conference_program_track_role_path(@conference.short_title, @track, @role.name),
|
||||
class: 'btn btn-primary pull-right'
|
||||
- else
|
||||
= link_to 'Edit', edit_admin_conference_role_path(@conference.short_title, @role.name), class: 'btn btn-primary pull-right'
|
||||
.text-muted
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@
|
|||
%tr
|
||||
%td
|
||||
= track.id
|
||||
%td{style: "padding: 15px 0px 0px 10px;"}
|
||||
%td{ style: 'padding: 15px 0px 0px 10px;' }
|
||||
= link_to admin_conference_program_track_path(@conference.short_title, track), class: 'btn' do
|
||||
%span.label{style: "background-color: #{track.color}; color: #{ contrast_color(track.color) }"}
|
||||
= track.name
|
||||
|
|
@ -60,7 +60,7 @@
|
|||
- else
|
||||
= track.state.humanize
|
||||
%td
|
||||
.btn-group{role: "group"}
|
||||
.btn-group{ role: 'group' }
|
||||
- if can? :edit, track
|
||||
= link_to 'Edit', edit_admin_conference_program_track_path(@conference.short_title, track), class: 'btn btn-primary'
|
||||
- special_style = true
|
||||
|
|
|
|||
|
|
@ -5,4 +5,9 @@ track_cfp_td = $('#cfp_switch_' + track_id);
|
|||
track_cfp_value = <%= @track.cfp_active %>;
|
||||
|
||||
track_cfp_td.attr('data-order', track_cfp_value);
|
||||
|
||||
/*
|
||||
* The updated data-order attribute isn't taken into account
|
||||
* until we invalidate the cell
|
||||
*/
|
||||
$('#tracks').DataTable().cell(track_cfp_td).invalidate();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue