nicolas/sadem_app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

suite

Browse Source
This commit is contained in:
Nicolas Bally 2020-07-30 15:49:53 +02:00
parent 364681bf5d
commit 551d8bbf25
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/m_odr_rep.rb
View File

@ -36,7 +36,7 @@ class MOdrRep < ApplicationRecord
validates :rgpd, :presence => true, :if => :rgpd_needed? validates :rgpd, :presence => true, :if => :rgpd_needed?
validates :reduc_code, :presence => true, length: { in: 6..6 }, :if => :reduc_code_needed? validates :reduc_code, :presence => true, :if => :reduc_code_needed? #length: { in: 6..6 },
validates :reduc, :presence => true, :if => :reduc_needed? validates :reduc, :presence => true, :if => :reduc_needed?

2
app/models/particular.rb
View File

@ -7,7 +7,7 @@ class Particular < ApplicationRecord
has_many :open_ranges, :through => :open_range_elements has_many :open_ranges, :through => :open_range_elements
belongs_to :owner, :polymorphic => true belongs_to :owner, :polymorphic => true
validates :civilite, :presence => true, :if => :force_validate_name #validates :civilite, :presence => true, :if => :force_validate_name
validates :name, :presence => true, :if => :force_validate_name validates :name, :presence => true, :if => :force_validate_name
validates :firstname, :presence => true, :if => :force_validate_name validates :firstname, :presence => true, :if => :force_validate_name
validates :email, :presence => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :if => :force_email_validation validates :email, :presence => true, :format => /\A([^@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :if => :force_email_validation

2
app/views/layouts/public.html.haml
View File

@ -178,7 +178,7 @@
=image_tag(@m_odr.footer_image_file.file.url, :class => "odr_banner", :style => (@m_odr.footer_image_width? ? "max-width:#{@m_odr.footer_image_width}px;margin:auto;": "")) =image_tag(@m_odr.footer_image_file.file.url, :class => "odr_banner", :style => (@m_odr.footer_image_width? ? "max-width:#{@m_odr.footer_image_width}px;margin:auto;": ""))
-if @m_odr.conditions -if @m_odr.conditions
.conditions=simple_format @m_odr.conditions .conditions{:style => "text-align:justify;font-size: 0.75em;"}=simple_format @m_odr.conditions