From c731f8cf1faffa7b4ee69121515c04eb9f2cbdc6 Mon Sep 17 00:00:00 2001 From: kara Diaby Date: Thu, 15 Jul 2021 15:52:51 +0200 Subject: [PATCH] add windows content type to avoid errors --- .../new_administrateur/groupe_instructeurs_controller.rb | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/controllers/new_administrateur/groupe_instructeurs_controller.rb b/app/controllers/new_administrateur/groupe_instructeurs_controller.rb index 23086104f..bf80c8995 100644 --- a/app/controllers/new_administrateur/groupe_instructeurs_controller.rb +++ b/app/controllers/new_administrateur/groupe_instructeurs_controller.rb @@ -3,6 +3,10 @@ module NewAdministrateur include ActiveSupport::NumberHelper ITEMS_PER_PAGE = 25 CSV_MAX_SIZE = 1.megabytes + CSV_ACCEPTED_CONTENT_TYPES = [ + "text/csv", + "application/vnd.ms-excel" + ] def index @procedure = procedure @@ -161,7 +165,7 @@ module NewAdministrateur end def import - if (group_csv_file.content_type != "text/csv") && (marcel_content_type != "text/csv") + if !CSV_ACCEPTED_CONTENT_TYPES.include?(group_csv_file.content_type) && !CSV_ACCEPTED_CONTENT_TYPES.include?(marcel_content_type) flash[:alert] = "Importation impossible : veuillez importer un fichier CSV" redirect_to admin_procedure_groupe_instructeurs_path(procedure) @@ -171,7 +175,6 @@ module NewAdministrateur else file = group_csv_file.read - # find the original encoding to avoid encoding errors base_encoding = CharlockHolmes::EncodingDetector.detect(file) groupes_emails = CSV.new(file.encode("UTF-8", base_encoding[:encoding], invalid: :replace, replace: ""), headers: true, header_converters: :downcase) .map { |r| r.to_h.slice('groupe', 'email') }