Skip to content

Commit

Permalink
Merge pull request #1659 from geeksforsocialchange/ik-1656-rollbar-bu…
Browse files Browse the repository at this point in the history
…g-208

Syntax error in show collections view
  • Loading branch information
ivan-kocienski-gfsc authored Jan 26, 2023
2 parents 2d57060 + 269040c commit 499bd30
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 16 deletions.
20 changes: 6 additions & 14 deletions app/views/collections/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,18 @@
<div class="g g--collection">
<div class="gi gi__3-5">
<% if @collection.description %>
<div class="first-ele-lg"><% #= markdown @collection.description %></div>
<div class="first-ele-lg"><%# = markdown @collection.description %></div>
<% end %>

<%# FIXME: this needs to be killed after launch! %>
<% if @collection.id == 1 %>
<p>
<%= link_to 'Download winter leaflet (PDF, colour)',
asset_path('2017/12/placecal_winter2017.pdf'),
class: 'btn' %><br>
<%= link_to 'Download winter leaflet (PDF, B&W)',
asset_path('2017/12/placecal_winter2017_bw.pdf'),
class: 'btn' %>
<%= link_to 'Download winter leaflet (PDF, colour)', asset_path('2017/12/placecal_winter2017.pdf'), class: 'btn' %><br>
<%= link_to 'Download winter leaflet (PDF, B&W)', asset_path('2017/12/placecal_winter2017_bw.pdf'), class: 'btn' %>
</p>
<p>
<%= link_to 'Download winter A3 Poster (PDF, colour)',
asset_path('2017/12/placecal_winter2017_poster.pdf'),
class: 'btn' %><br>
<%= link_to 'Download winter A3 Poster (PDF, B&W)',
asset_path('2017/12/placecal_winter2017_poster_bw.pdf'),
class: 'btn' %>
<%= link_to 'Download winter A3 Poster (PDF, colour)', asset_path('2017/12/placecal_winter2017_poster.pdf'), class: 'btn' %><br>
<%= link_to 'Download winter A3 Poster (PDF, B&W)', asset_path('2017/12/placecal_winter2017_poster_bw.pdf'), class: 'btn' %>
</p>
<% end %>
</div>
Expand All @@ -62,5 +54,5 @@
</div>

<% if @map&.any? %>
<%= render_component "map", points: @map, site: @current_site.slug %>
<%# = render_component "map", points: @map, site: @current_site.slug %>
<% end %>
1 change: 0 additions & 1 deletion test/controllers/collections_controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ class CollectionsControllerTest < ActionDispatch::IntegrationTest
end

test 'should show collection' do
skip 'New neighbourhood code stopped this working but Collections not used currently'
get collection_url(@collection)
assert_response :success
end
Expand Down
2 changes: 1 addition & 1 deletion test/integration/collections_integration_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ class CollectionsIntegrationTest < ActionDispatch::IntegrationTest
end

test 'should show collection' do
skip 'New neighbourhood code stopped this working but Collections not used currently'
# skip 'New neighbourhood code stopped this working but Collections not used currently'
get collection_url(@collection)
assert_response :success
assert_select 'title', count: 1, text: "#{@collection.name} | #{@site.name}"
Expand Down

0 comments on commit 499bd30

Please sign in to comment.