DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2017-01-03 15:12:59 +01:00
commit 63ad8c2053
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/piece_justificative.rb
View file

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