diff --git a/.github/workflows/build-test-lint.yaml b/.github/workflows/build-test-lint.yaml index 998e9489..91ceaaa2 100644 --- a/.github/workflows/build-test-lint.yaml +++ b/.github/workflows/build-test-lint.yaml @@ -17,7 +17,7 @@ on: jobs: build: - uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.18 + uses: scientist-softserv/actions/.github/workflows/build.yaml@v0.0.22 secrets: inherit with: platforms: 'linux/amd64' @@ -26,7 +26,7 @@ jobs: test: needs: build - uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.18 + uses: scientist-softserv/actions/.github/workflows/test.yaml@v0.0.22 with: confdir: '/app/samvera/hyrax-webapp/solr/conf' webTarget: hyku-web @@ -35,7 +35,7 @@ jobs: lint: needs: build - uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.18 + uses: scientist-softserv/actions/.github/workflows/lint.yaml@v0.0.22 with: webTarget: hyku-web workerTarget: hyku-worker diff --git a/app/views/journal_articles/edit_fields/_date_created.html.erb b/app/views/journal_articles/edit_fields/_date_created.html.erb index 449141f4..825c77e7 100644 --- a/app/views/journal_articles/edit_fields/_date_created.html.erb +++ b/app/views/journal_articles/edit_fields/_date_created.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_accepted.html.erb b/app/views/records/edit_fields/_date_accepted.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_accepted.html.erb +++ b/app/views/records/edit_fields/_date_accepted.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_available.html.erb b/app/views/records/edit_fields/_date_available.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_available.html.erb +++ b/app/views/records/edit_fields/_date_available.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_collected.html.erb b/app/views/records/edit_fields/_date_collected.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_collected.html.erb +++ b/app/views/records/edit_fields/_date_collected.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_copyrighted.html.erb b/app/views/records/edit_fields/_date_copyrighted.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_copyrighted.html.erb +++ b/app/views/records/edit_fields/_date_copyrighted.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_created.html.erb b/app/views/records/edit_fields/_date_created.html.erb index 00e0b36e..719929ee 100644 --- a/app/views/records/edit_fields/_date_created.html.erb +++ b/app/views/records/edit_fields/_date_created.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_issued.html.erb b/app/views/records/edit_fields/_date_issued.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_issued.html.erb +++ b/app/views/records/edit_fields/_date_issued.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_of_award.html.erb b/app/views/records/edit_fields/_date_of_award.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_of_award.html.erb +++ b/app/views/records/edit_fields/_date_of_award.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_published.html.erb b/app/views/records/edit_fields/_date_published.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_published.html.erb +++ b/app/views/records/edit_fields/_date_published.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_submitted.html.erb b/app/views/records/edit_fields/_date_submitted.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_submitted.html.erb +++ b/app/views/records/edit_fields/_date_submitted.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_updated.html.erb b/app/views/records/edit_fields/_date_updated.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_updated.html.erb +++ b/app/views/records/edit_fields/_date_updated.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_date_valid.html.erb b/app/views/records/edit_fields/_date_valid.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_date_valid.html.erb +++ b/app/views/records/edit_fields/_date_valid.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_default.html.erb b/app/views/records/edit_fields/_default.html.erb index ebc5b4d0..52a69b54 100644 --- a/app/views/records/edit_fields/_default.html.erb +++ b/app/views/records/edit_fields/_default.html.erb @@ -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] %> diff --git a/app/views/records/edit_fields/_end_date.html.erb b/app/views/records/edit_fields/_end_date.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_end_date.html.erb +++ b/app/views/records/edit_fields/_end_date.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_event_date.html.erb b/app/views/records/edit_fields/_event_date.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_event_date.html.erb +++ b/app/views/records/edit_fields/_event_date.html.erb @@ -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) %> diff --git a/app/views/records/edit_fields/_start_date.html.erb b/app/views/records/edit_fields/_start_date.html.erb index 738c00ee..968648d2 100644 --- a/app/views/records/edit_fields/_start_date.html.erb +++ b/app/views/records/edit_fields/_start_date.html.erb @@ -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) %>