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 2016-11-25 12:21:00 +01:00
commit eac9f2dadc
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/cerfa.rb
View file

@ -3,7 +3,7 @@ class Cerfa < ActiveRecord::Base
belongs_to :user belongs_to :user
mount_uploader :content, CerfaUploader mount_uploader :content, CerfaUploader
validates :content, :file_size => {:maximum => 6.megabytes} validates :content, :file_size => {:maximum => 20.megabytes}
def empty? def empty?
content.blank? content.blank?

2
app/models/piece_justificative.rb
View file

@ -10,7 +10,7 @@ class PieceJustificative < ActiveRecord::Base
alias_attribute :type, :type_de_piece_justificative_id alias_attribute :type, :type_de_piece_justificative_id
mount_uploader :content, PieceJustificativeUploader mount_uploader :content, PieceJustificativeUploader
validates :content, :file_size => {:maximum => 6.megabytes} validates :content, :file_size => {:maximum => 20.megabytes}
validates :content, presence: true, allow_blank: false, allow_nil: false validates :content, presence: true, allow_blank: false, allow_nil: false
def empty? def empty?

4
config/locales/fr.yml
View file

@ -44,11 +44,11 @@ fr:
piece_justificative: piece_justificative:
attributes: attributes:
content: content:
size_too_big: "La taille du fichier joint est trop importante. Elle doit être inférieure à 6Mo." size_too_big: "La taille du fichier joint est trop importante. Elle doit être inférieure à 20Mo."
cerfa: cerfa:
attributes: attributes:
content: content:
size_too_big: "La taille du fichier joint est trop importante. Elle doit être inférieure à 6Mo." size_too_big: "La taille du fichier joint est trop importante. Elle doit être inférieure à 20Mo."
user: user:
attributes: attributes:
reset_password_token: reset_password_token: