Skip to content

Commit

Permalink
🐛 Fix form for resoures (#704)
Browse files Browse the repository at this point in the history
# Story

A dev was unable to edit a resource without receiving an error from the
partial. This PR updates the partials to handle resources and dog
biscuit records.

Refs

- #687
# Expected Behavior Before Changes

![image](https://github.com/user-attachments/assets/86ee18b6-0f3e-4f07-af84-a771ababf81b)


# Expected Behavior After Changes


![image](https://github.com/user-attachments/assets/3bb6c57d-f295-4117-8f86-3178fbc796ef)
  • Loading branch information
Shana Moore authored Jul 23, 2024
2 parents f564e5c + 5e0148e commit 5213dbb
Show file tree
Hide file tree
Showing 17 changed files with 19 additions and 19 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/build-test-lint.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ on:

jobs:
build:
uses: scientist-softserv/actions/.github/workflows/[email protected].18
uses: scientist-softserv/actions/.github/workflows/[email protected].22
secrets: inherit
with:
platforms: 'linux/amd64'
Expand All @@ -26,7 +26,7 @@ jobs:

test:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected].18
uses: scientist-softserv/actions/.github/workflows/[email protected].22
with:
confdir: '/app/samvera/hyrax-webapp/solr/conf'
webTarget: hyku-web
Expand All @@ -35,7 +35,7 @@ jobs:

lint:
needs: build
uses: scientist-softserv/actions/.github/workflows/[email protected].18
uses: scientist-softserv/actions/.github/workflows/[email protected].22
with:
webTarget: hyku-web
workerTarget: hyku-worker
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key]&.first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_accepted.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_available.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_collected.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_copyrighted.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_created.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%# use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key]&.first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_issued.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_of_award.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_published.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_submitted.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_updated.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_date_valid.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_default.html.erb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<% # the hyrax version of this file messes singular field display %>
<% if f.object.class.multiple?(key) %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { class: 'form-control' }, required: f.object.required?(key) %>
<% else %>
<% value = f.object.model[key] %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_end_date.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_event_date.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/records/edit_fields/_start_date.html.erb
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<% # use date picker %>

<% if f.object.class.multiple? key %>
<% f.object.try(:multiple?, key) || f.object.class.try(:multiple?, key) %>
<%= f.input key, as: :multi_value, input_html: { data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
<% else %>
<%= f.input key, input_html: { value: f.object.model[key].first, data: { provide: 'datepicker', 'date-force-parse': 'false', 'date-autoclose': 'true' } }, required: f.object.required?(key) %>
Expand Down

0 comments on commit 5213dbb

Please sign in to comment.