diff --git a/app/views/material_releases/index.html.erb b/app/views/material_releases/index.html.erb index d9caf62..bf06d21 100644 --- a/app/views/material_releases/index.html.erb +++ b/app/views/material_releases/index.html.erb @@ -1,5 +1,6 @@
+ />
<% if policy(MaterialRelease).new? %> <%= link_to fa_icon("plus", text: t(".actions.new")), [:new, @project, :material_release], class: "btn btn-primary mr-2 mb-2" %> @@ -10,7 +11,7 @@ <% end %> <% if @material_releases.any? && policy(MaterialRelease).download_multiple? %> - <%= link_to "Download All", [@project, :contract_downloads, release_type: @material_releases.name], method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: { + <%= button_to "Download", [@project, :contract_downloads, release_type: @material_releases.name], id: "download_releases", method: :post, remote: true, class: "btn btn-light border ml-auto mr-2 mb-2", data: { disable_with: "Please wait..." } %> <% end %> diff --git a/app/views/material_releases/index.js.erb b/app/views/material_releases/index.js.erb index 69a9833..ac2d433 100644 --- a/app/views/material_releases/index.js.erb +++ b/app/views/material_releases/index.js.erb @@ -1,3 +1,5 @@ $("#material_releases").html("<%= j render(@material_releases) %>"); $("form input[type='search']").val("<%= params[:query] %>"); $("#material_releases_pagination").html("<%= j will_paginate(@material_releases) %>"); +$("#selected_releases_form").attr('data-releasable-ids', JSON.stringify([])); +$("#total_entries").val(<%= @material_releases.total_entries %>); \ No newline at end of file diff --git a/spec/jobs/generate_contracts_zip_job_spec.rb b/spec/jobs/generate_contracts_zip_job_spec.rb index d2a2420..dc20325 100644 --- a/spec/jobs/generate_contracts_zip_job_spec.rb +++ b/spec/jobs/generate_contracts_zip_job_spec.rb @@ -196,10 +196,13 @@ describe GenerateContractsZipJob do end context "generates ZIP for material releases" do - let(:release) { create(:material_release_with_contract_template, :native, project: project) } + let(:release) { create(:material_release_with_contract_template, :native, project: project, name: "John") } + let(:release2) { create(:material_release_with_contract_template, :native, project: project, name: "Jane") } + let(:release3) { create(:material_release_with_contract_template, :native, project: project, name: "Brad") } subject { 'MaterialRelease' } it_behaves_like "generates ZIP containig CSV file with all releases data" + it_behaves_like "generates ZIP containig CSV file with specific releases data" end context "generates ZIP for medical releases" do