From e15b1283e5f9fde3be1bd4a3c8f3595116801dc3 Mon Sep 17 00:00:00 2001 From: Alex Sherman Date: Mon, 1 Jun 2020 14:36:16 +0500 Subject: [PATCH] Add error handling if legaldoc file not found Closes #1452 --- app/controllers/admin/legal_documents_controller.rb | 9 ++++++++- config/locales/admin/legal_documents.en.yml | 2 ++ config/locales/admin/legal_documents.et.yml | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 config/locales/admin/legal_documents.en.yml create mode 100644 config/locales/admin/legal_documents.et.yml diff --git a/app/controllers/admin/legal_documents_controller.rb b/app/controllers/admin/legal_documents_controller.rb index a07949875..70ebddded 100644 --- a/app/controllers/admin/legal_documents_controller.rb +++ b/app/controllers/admin/legal_documents_controller.rb @@ -5,7 +5,14 @@ module Admin def show @ld = LegalDocument.find(params[:id]) filename = @ld.path.split('/').last - send_data File.open(@ld.path).read, filename: filename + file = File.open(@ld.path).read + + if file + send_data file, filename: filename + else + flash[:notice] = I18n.t('legal_doc_not_found') + redirect_to [:admin, @ld.documentable] + end end end end diff --git a/config/locales/admin/legal_documents.en.yml b/config/locales/admin/legal_documents.en.yml new file mode 100644 index 000000000..f24d883a6 --- /dev/null +++ b/config/locales/admin/legal_documents.en.yml @@ -0,0 +1,2 @@ +en: + legal_doc_not_found: "There is an error downloading legal document: file not found" diff --git a/config/locales/admin/legal_documents.et.yml b/config/locales/admin/legal_documents.et.yml new file mode 100644 index 000000000..d3ebfa512 --- /dev/null +++ b/config/locales/admin/legal_documents.et.yml @@ -0,0 +1,2 @@ +et: + legal_doc_not_found: "Viga juriidilise dokumendi allalaadimisel: faili ei leitud"