Merge branch 'develop' into staging

2017-01-03 15:12:59 +01:00 · 2017-01-03 15:12:59 +01:00 · 63ad8c2053
commit 63ad8c2053
parent aa5349e8b4 54bcc829c0
1 changed files with 8 additions and 0 deletions
--- a/app/models/piece_justificative.rb
+++ b/app/models/piece_justificative.rb
@ -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