Merge branch 'staging'

This commit is contained in:
Xavier J 2017-01-03 15:13:12 +01:00
commit 2f8b918aa6

View file

@ -19,6 +19,14 @@ class PieceJustificative < ActiveRecord::Base
content.blank?
end
def libelle
if type_de_piece_justificative.nil?
return content.to_s
else
type_de_piece_justificative.libelle
end
end
def content_url
unless content.url.nil?
if Features.remote_storage