From d26feb4c721b1c02fe311060da042fa90b139ffc Mon Sep 17 00:00:00 2001
From: Xavier J <xavijulien@gmail.com>
Date: Mon, 6 Jun 2016 16:38:14 +0200
Subject: [PATCH] Add JPG and PNG image on cerfa and piece justificative
 uploader

---
 app/models/piece_justificative.rb             | 6 ++++--
 app/uploaders/cerfa_uploader.rb               | 2 +-
 app/uploaders/piece_justificative_uploader.rb | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/piece_justificative.rb b/app/models/piece_justificative.rb
index 7bb2cdb34..4d80291b1 100644
--- a/app/models/piece_justificative.rb
+++ b/app/models/piece_justificative.rb
@@ -23,7 +23,7 @@ class PieceJustificative < ActiveRecord::Base
         (RemoteDownloader.new content.filename).url
       else
         (LocalDownloader.new content.path,
-                        (type_de_piece_justificative.nil? ? content.original_filename : type_de_piece_justificative.libelle)).url
+                             (type_de_piece_justificative.nil? ? content.original_filename : type_de_piece_justificative.libelle)).url
       end
     end
   end
@@ -38,7 +38,9 @@ class PieceJustificative < ActiveRecord::Base
       application/vnd.openxmlformats-officedocument.presentationml.presentation,
       application/vnd.oasis.opendocument.text,
       application/vnd.oasis.opendocument.presentation,
-      application/vnd.oasis.opendocument.spreadsheet
+      application/vnd.oasis.opendocument.spreadsheet,
+      image/png,
+      image/jpeg
     "
   end
 end
diff --git a/app/uploaders/cerfa_uploader.rb b/app/uploaders/cerfa_uploader.rb
index c69dcbac8..1f8371a38 100644
--- a/app/uploaders/cerfa_uploader.rb
+++ b/app/uploaders/cerfa_uploader.rb
@@ -25,7 +25,7 @@ class CerfaUploader < CarrierWave::Uploader::Base
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
-    %w(pdf doc docx xls xlsx ppt pptx odt ods odp)
+    %w(pdf doc docx xls xlsx ppt pptx odt ods odp jpg jpeg png)
   end
 
   def filename
diff --git a/app/uploaders/piece_justificative_uploader.rb b/app/uploaders/piece_justificative_uploader.rb
index ce446eb0a..c3cd6a556 100644
--- a/app/uploaders/piece_justificative_uploader.rb
+++ b/app/uploaders/piece_justificative_uploader.rb
@@ -25,7 +25,7 @@ class PieceJustificativeUploader < CarrierWave::Uploader::Base
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
-    %w(pdf doc docx xls xlsx ppt pptx odt ods odp)
+    %w(pdf doc docx xls xlsx ppt pptx odt ods odp jpg jpeg png)
   end
 
   def filename