Skip to content

Commit 8dcab68

Browse files
authored
Merge pull request #67 from MITLibraries/rdi-237-adv-search-fix
Display complete input values in advanced search form
2 parents 7e2fde0 + 6dd9a24 commit 8dcab68

File tree

3 files changed

+115
-7
lines changed

3 files changed

+115
-7
lines changed

app/views/search/_form.html.erb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@ end
3030
<div class="field-container">
3131
<div class="field-wrap">
3232
<label for="advanced-citation" class="field-label">Citation</label>
33-
<input type="text" class="field field-text wide" id="advanced-citation" name="citation" placeholder="Citation" value=<%= params[:citation] %>>
33+
<input type="text" class="field field-text wide" id="advanced-citation" name="citation" placeholder="Citation" value="<%= params[:citation] %>">
3434
</div>
3535

3636
<div class="field-wrap">
3737
<label for="advanced-contributors" class="field-label">Contributors</label>
38-
<input type="text" class="field field-text wide" id="advanced-contributors" name="contributors" placeholder="Contributors" value=<%= params[:contributors] %>>
38+
<input type="text" class="field field-text wide" id="advanced-contributors" name="contributors" placeholder="Contributors" value="<%= params[:contributors] %>">
3939
</div>
4040

4141
<div class="field-wrap">
4242
<label for="advanced-fundingInformation" class="field-label">Funding information</label>
43-
<input type="text" class="field field-text wide" id="advanced-fundingInformation" name="fundingInformation" placeholder="Funding information" value=<%= params[:fundingInformation] %>>
43+
<input type="text" class="field field-text wide" id="advanced-fundingInformation" name="fundingInformation" placeholder="Funding information" value="<%= params[:fundingInformation] %>">
4444
</div>
4545

4646
<div class="field-wrap">
4747
<label for="advanced-identifiers" class="field-label">Identifiers</label>
48-
<input type="text" class="field field-text wide" id="advanced-identifiers" name="identifiers" placeholder="Identifiers" value=<%= params[:identifiers] %>>
48+
<input type="text" class="field field-text wide" id="advanced-identifiers" name="identifiers" placeholder="Identifiers" value="<%= params[:identifiers] %>">
4949
</div>
5050

5151
<div class="field-wrap">
5252
<label for="advanced-locations" class="field-label">Locations</label>
53-
<input type="text" class="field field-text wide" id="advanced-locations" name="locations" placeholder="Locations" value=<%= params[:locations] %>>
53+
<input type="text" class="field field-text wide" id="advanced-locations" name="locations" placeholder="Locations" value="<%= params[:locations] %>">
5454
</div>
5555

5656
<div class="field-wrap">
5757
<label for="advanced-subjects" class="field-label">Subjects</label>
58-
<input type="text" class="field field-text wide" id="advanced-subjects" name="subjects" placeholder="Subjects" value=<%= params[:subjects] %>>
58+
<input type="text" class="field field-text wide" id="advanced-subjects" name="subjects" placeholder="Subjects" value="<%= params[:subjects] %>">
5959
</div>
6060

6161
<div class="field-wrap">
6262
<label for="advanced-title" class="field-label">Title</label>
63-
<input type="text" class="field field-text wide" id="advanced-title" name="title" placeholder="Title" value=<%= params[:title] %>>
63+
<input type="text" class="field field-text wide" id="advanced-title" name="title" placeholder="Title" value="<%= params[:title] %>">
6464
</div>
6565

6666
<div class="field-wrap list-checkboxes">

test/controllers/search_controller_test.rb

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -321,6 +321,36 @@ class SearchControllerTest < ActionDispatch::IntegrationTest
321321
end
322322
end
323323

324+
test 'advanced search form retains values with spaces' do
325+
VCR.use_cassette('advanced all spaces',
326+
allow_playback_repeats: true,
327+
match_requests_on: %i[method uri body]) do
328+
query = {
329+
q: 'some data',
330+
citation: 'a citation',
331+
contributors: 'some contribs',
332+
fundingInformation: 'a fund',
333+
identifiers: 'some ids',
334+
locations: 'some locs',
335+
subjects: 'some subs',
336+
title: 'a title',
337+
advanced: 'true'
338+
}.to_query
339+
get "/results?#{query}"
340+
assert_response :success
341+
assert_nil flash[:error]
342+
343+
assert_select 'input#basic-search-main', value: 'some data'
344+
assert_select 'input#advanced-citation', value: 'a citation'
345+
assert_select 'input#advanced-contributors', value:'some contribs'
346+
assert_select 'input#advanced-fundingInformation', value: 'a fund'
347+
assert_select 'input#advanced-identifiers', value: 'some ids'
348+
assert_select 'input#advanced-locations', value: 'some locs'
349+
assert_select 'input#advanced-subjects', value: 'some subs'
350+
assert_select 'input#advanced-title', value: 'a title'
351+
end
352+
end
353+
324354
def source_facet_count(controller)
325355
controller.view_context.assigns['facets']['source'].count
326356
end

test/vcr_cassettes/advanced_all_spaces.yml

Lines changed: 78 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)