Skip to content

Commit 5ab6b4b

Browse files
authored
Merge pull request #314 from MITLibraries/use-252-fulfillment-buttons
Normalize fulfillment links
2 parents 3ea5e91 + 3c5a268 commit 5ab6b4b

File tree

4 files changed

+6
-19
lines changed

4 files changed

+6
-19
lines changed

app/helpers/search_helper.rb

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,6 @@ def link_to_tab(target, label = nil)
4141
end
4242
end
4343

44-
def view_online(result)
45-
return unless result[:source_link].present?
46-
47-
link_to 'View online', result[:source_link], class: 'button button-primary'
48-
end
49-
5044
def view_record(record_id)
5145
link_to 'View full record', record_path(id: record_id), class: 'button button-primary'
5246
end

app/views/search/_result.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
</div>
5858

5959
<div class="result-get">
60-
<%= view_online(result) %>
60+
<%= view_record(result) %>
6161
</div>
6262
</div>
6363
</li>

app/views/search/_result_primo.html.erb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,11 @@
6262
<div class="result-get">
6363
<% if result[:links].present? %>
6464
<% result[:links].each do |link| %>
65-
<%= link_to link['kind'].titleize, link['url'], class: 'button' %>
65+
<% if link['kind'].downcase == 'full record' %>
66+
<%= view_record(link) %>
67+
<% else %>
68+
<%= link_to link['kind'].titleize, link['url'], class: 'button' %>
69+
<% end %>
6670
<% end %>
6771
<% end %>
6872
<% if Libkey.enabled? && result[:doi].present? %>

test/helpers/search_helper_test.rb

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -26,17 +26,6 @@ class SearchHelperTest < ActionView::TestCase
2626
{ 'matchedField' => 'citation', 'matchedPhrases' => 'Datascientist, Jane' }], trim_highlights(result)
2727
end
2828

29-
test 'renders view_online link if source_link is present' do
30-
result = { title: 'A record', source_link: 'https://example.org' }
31-
assert_equal '<a class="button button-primary" href="https://example.org">View online</a>',
32-
view_online(result)
33-
end
34-
35-
test 'does not render view_online link if source_link is absent' do
36-
result = { title: 'A record' }
37-
assert_nil view_online(result)
38-
end
39-
4029
test 'parse_geo_dates returns issued over coverage' do
4130
dates = [{ 'kind' => 'Coverage', 'value' => '2009-01-01' },
4231
{ 'kind' => 'Issued', 'value' => '2011' }]

0 commit comments

Comments
 (0)