Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion app/presenters/chapter_presenter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ def upcoming_workshops
end

def organisers
@organisers ||= model.permissions.find_by(name: 'organiser').members
chapter = model.permissions.find_by(name: 'organiser')

@organisers ||= chapter ? chapter.members : []
end
end
30 changes: 16 additions & 14 deletions app/views/chapter/show.html.haml
Original file line number Diff line number Diff line change
Expand Up @@ -21,21 +21,22 @@
- else
= link_to t('members.sign_up'), new_member_path, class: 'btn btn-primary'

.container.py-4.py-lg-5
.row
.col-md-8.col-sm-12
- if @upcoming_workshops.any?
%h2.mb-4= t('homepage.events.upcoming')
- @upcoming_workshops.each do |date, workshops|
%h3.h5= date
= render workshops

- if @latest_workshops.any?
.pt-4
%h2.mb-4 Past Events
- @latest_workshops.each do |date, workshops|
- if @upcoming_workshops.any? || @latest_workshops.any?
.container.py-4.py-lg-5
.row
.col-md-8.col-sm-12
- if @upcoming_workshops.any?
%h2.mb-4= t('homepage.events.upcoming')
- @upcoming_workshops.each do |date, workshops|
%h3.h5= date
= render workshops

- if @latest_workshops.any?
.pt-4
%h2.mb-4 Past Events
- @latest_workshops.each do |date, workshops|
= render workshops

- if @recent_sponsors.any?
.py-4.py-lg-5.bg-light
.container
Expand All @@ -45,7 +46,8 @@
= render partial: 'shared/sponsors', object: @recent_sponsors

.container.py-4.py-lg-5
= render partial: 'members/organisers_grid', locals: { members: @chapter.organisers.shuffle, show_info: false, title: t('chapters.team') }
- if @chapter.organisers.any?
= render partial: 'members/organisers_grid', locals: { members: @chapter.organisers.shuffle, show_info: false, title: t('chapters.team') }

.mt-5
.alert.alert-primary.mb-0
Expand Down
10 changes: 10 additions & 0 deletions spec/features/chapter_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@
expect(page).to have_content('Page not found')
end

it 'renders chapter without organisers' do
chapter = Fabricate(:chapter_without_organisers, name: "Empty Chapter")
expect(chapter.organisers.size).to eq 0

visit chapter_path(chapter.slug)

expect(page).to have_content "Empty Chapter"
expect(page).not_to have_content "Team"
end

it 'renders any upcoming workshops for the chapter' do
chapter = Fabricate(:chapter)
workshops = 2.times.map do |n|
Expand Down