From 551d8bbf257f997bc6e1b3f5cde900db3b0c99bd Mon Sep 17 00:00:00 2001 From: Nicolas Bally Date: Thu, 30 Jul 2020 15:49:53 +0200 Subject: [PATCH] suite --- app/models/m_odr_rep.rb | 2 +- app/models/particular.rb | 2 +- app/views/layouts/public.html.haml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/m_odr_rep.rb b/app/models/m_odr_rep.rb index a6ef896..bcd8b63 100644 --- a/app/models/m_odr_rep.rb +++ b/app/models/m_odr_rep.rb @@ -36,7 +36,7 @@ class MOdrRep < ApplicationRecord 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? diff --git a/app/models/particular.rb b/app/models/particular.rb index 9367fcd..efe692c 100644 --- a/app/models/particular.rb +++ b/app/models/particular.rb @@ -7,7 +7,7 @@ class Particular < ApplicationRecord has_many :open_ranges, :through => :open_range_elements 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 :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 diff --git a/app/views/layouts/public.html.haml b/app/views/layouts/public.html.haml index 3ace103..7f5d0f9 100644 --- a/app/views/layouts/public.html.haml +++ b/app/views/layouts/public.html.haml @@ -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;": "")) -if @m_odr.conditions - .conditions=simple_format @m_odr.conditions + .conditions{:style => "text-align:justify;font-size: 0.75em;"}=simple_format @m_odr.conditions