Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: APPS-2680 html tags and "read more" button for the search results #1152

Merged
merged 7 commits into from
Aug 29, 2024
Merged

feat: APPS-2680 html tags and "read more" button for the search results #1152

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0457e2a
feat: APPS-2680 html tags and "read more" button for the search results
kethlinmil Aug 23, 2024
362f90c
Merge branch 'main' into APPS-2680-search-results
github-actions[bot] Aug 23, 2024
39e8187
Allow .html_safe
sourcefilter Aug 23, 2024
12ac276
APPS-2680: updated JS to not cut description in the middle of the word
kethlinmil Aug 26, 2024
ef1e6c1
APPS-2680: updated JS to not cut description in the middle of the wor…
kethlinmil Aug 26, 2024
784745c
Merge branch 'main' into APPS-2680-search-results
github-actions[bot] Aug 29, 2024
5335d6a
Merge branch 'main' into APPS-2680-search-results
sourcefilter Aug 29, 2024
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: 2 additions & 2 deletions app/helpers/ursus/catalog_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ def render_truncated_description(args)
description = args[:value].first
button = "<span class='view-more' href>Read More <div class='down-arrow'>&raquo;</div></span></br>"
truncated_output << "<div class='description'>#{description}</div>#{button}</br>"
# return truncated_output.html_safe
return description
# rubocop:disable Rails::OutputSafety
truncated_output.html_safe
end
end
end
Expand Down
5 changes: 3 additions & 2 deletions spec/system/search_catalog_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
has_model_ssim: ['Work'],
title_tesim: ['Orange Carrot'],
photographer_tesim: ['Bittersweet Tangerine'],
description_tesim: ['Long description Long description Long description Long description Long description Long description']
description_tesim: ['Long description Long description Long description<br>Long description Long description Long description']
}
end

Expand Down Expand Up @@ -147,7 +147,8 @@
# Search for something
fill_in 'q', with: 'carrot'
click_on 'search'
expect(page).not_to have_content('Read More')
expect(page).to have_content('Read More')
expect(page).not_to have_content('<br>')
end

context 'when the sinai? flag is disabled' do
Expand Down
Loading