Fix display of volunteer events
This commit is contained in:
parent
d1b2ad3528
commit
13d78c2609
3 changed files with 13 additions and 12 deletions
|
|
@ -259,7 +259,7 @@ class User < ApplicationRecord
|
||||||
# TODO: Use a real authorization in the right place....
|
# TODO: Use a real authorization in the right place....
|
||||||
def manages_volunteers?(conference)
|
def manages_volunteers?(conference)
|
||||||
organizer_roles = get_roles['organizer']
|
organizer_roles = get_roles['organizer']
|
||||||
organizer_roles&.include?(conference.short_title) # TODO or Volunteer Coorinator.
|
organizer_roles&.include?(conference.short_title) # TODO or Volunteer Coorinator.
|
||||||
end
|
end
|
||||||
|
|
||||||
def registered
|
def registered
|
||||||
|
|
|
||||||
|
|
@ -70,9 +70,6 @@
|
||||||
%span{ title: event.state.humanize, class: "fa #{status_icon(event)}" }
|
%span{ title: event.state.humanize, class: "fa #{status_icon(event)}" }
|
||||||
|
|
||||||
%td.col-md-7{style: "padding:20px 8px 20px 8px;"}
|
%td.col-md-7{style: "padding:20px 8px 20px 8px;"}
|
||||||
- if event.volunteers.include?(current_user)
|
|
||||||
%strong You are volunteer host for:
|
|
||||||
%br
|
|
||||||
= link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
|
= link_to event.title, conference_program_proposal_path(@conference.short_title, event.id)
|
||||||
%br
|
%br
|
||||||
%small.text-muted
|
%small.text-muted
|
||||||
|
|
@ -117,12 +114,15 @@
|
||||||
= link_to 'Edit', edit_conference_program_proposal_path(@conference.short_title, event.id),
|
= link_to 'Edit', edit_conference_program_proposal_path(@conference.short_title, event.id),
|
||||||
class: 'btn btn-default', id: "edit_proposal_#{event.id}"
|
class: 'btn btn-default', id: "edit_proposal_#{event.id}"
|
||||||
|
|
||||||
- if @volunteer_events.any?
|
- if @volunteer_events.any?
|
||||||
%h2
|
.row
|
||||||
Volunteer Events
|
.col-md-12
|
||||||
%small
|
%h2
|
||||||
Thanks for being a host at #{@conference.title}
|
Volunteer Duties
|
||||||
= render 'volunteers_table', events: @volunteer_events
|
%small
|
||||||
|
Thanks for being a host at #{@conference.title}
|
||||||
|
= render 'volunteers_table', events: @volunteer_events
|
||||||
|
|
||||||
.row
|
.row
|
||||||
.col-md-12
|
.col-md-12
|
||||||
- if can? :create, @event
|
- if can? :create, @event
|
||||||
|
|
|
||||||
|
|
@ -9,12 +9,13 @@
|
||||||
= canceled_replacement_event_label(event, event_schedule)
|
= canceled_replacement_event_label(event, event_schedule)
|
||||||
= replacement_event_notice(event_schedule)
|
= replacement_event_notice(event_schedule)
|
||||||
|
|
||||||
%span.h3{style: "margin-bottom: 20px"}
|
%span.h3{style: "margin-bottom: 14px"}
|
||||||
= event.title
|
= event.title
|
||||||
%br
|
%br
|
||||||
%small
|
%small{style: "color: #{contrast_color(header_color)}"}
|
||||||
= event.subtitle
|
= event.subtitle
|
||||||
.trapezoid{style: "color: #{header_color}; top: 12px;"}
|
.trapezoid{style: "color: #{header_color}; top: 12px;"}
|
||||||
|
|
||||||
.panel-body
|
.panel-body
|
||||||
%h4
|
%h4
|
||||||
- if(event.speakers.any?)
|
- if(event.speakers.any?)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue