From 93a4ce462dae3089586a83d88381afde07399597 Mon Sep 17 00:00:00 2001 From: Senad Uka Date: Tue, 7 Jul 2020 21:45:30 +0200 Subject: [PATCH] Upstream sync --- app/jobs/generate_contracts_zip_job.rb | 2 +- app/models/qr_code.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/jobs/generate_contracts_zip_job.rb b/app/jobs/generate_contracts_zip_job.rb index 1279003..865a5ea 100644 --- a/app/jobs/generate_contracts_zip_job.rb +++ b/app/jobs/generate_contracts_zip_job.rb @@ -22,7 +22,7 @@ class GenerateContractsZipJob < ApplicationJob end end - @download.file.attach(io: File.open(zipfile_name), filename: @folder_name) + @download.file.attach(io: File.open(zipfile_name), filename: "#{@folder_name}.zip") end rescue StandardError => e Rails.logger.error("Failed to generate download for project (##{project.id}) with release type #{release_type}\n" + e.message) diff --git a/app/models/qr_code.rb b/app/models/qr_code.rb index a38e0df..2dd13de 100644 --- a/app/models/qr_code.rb +++ b/app/models/qr_code.rb @@ -10,7 +10,7 @@ class QrCode url = Rails.application.routes.url_helpers.url_for(route) filename = [contract_template.project.name, contract_template.name].map(&:parameterize).join("_") - new(url, filename) + new(url, "#{filename}.png") end def initialize(url, filename = "qrcode.png")