Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrige le formulaire de modification de structure #1739

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/models/structure.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class Structure < ApplicationRecord
end
end

before_validation :retire_espaces_siret
after_validation :geocode, if: ->(s) { s.code_postal.present? and s.code_postal_changed? }
after_create :programme_email_relance

Expand Down Expand Up @@ -90,4 +91,10 @@ def verifie_siret_ou_siren

errors.add(:siret, :invalid)
end

def retire_espaces_siret
return if siret.blank?

self.siret = siret.gsub(/[[:space:]]/, '')
end
end
2 changes: 1 addition & 1 deletion app/views/admin/structures_locales/_form.html.arb
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

render partial: 'nouvelles_structures/modal_mise_en_garde' if params[:mise_en_garde] == 'affiche'
div class: 'panel nouvelle_structure' do
h2 t('.titre')
h2 t(resource.new_record? ? '.titre.nouveau' : '.titre.modification')
active_admin_form_for [:admin, resource] do |f|
f.inputs do
f.object.code_postal = params[:code_postal]&.delete('^0-9') if f.object.code_postal.blank?
Expand Down
4 changes: 3 additions & 1 deletion config/locales/views/structures.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,9 @@ fr:
voir: Voir
structures_locales:
form:
titre: Création d'une nouvelle structure
titre:
nouveau: Création d'une nouvelle structure
modification: Modification de la structure
verifier_information_structure: |
**Veuillez vérifier les informations saisies avant de valider cette création.**
Si vous avez des difficultés, vous pouvez nous contacter à : [contact@beta.gouv.fr](mailto:contact@beta.gouv.fr)
Expand Down
11 changes: 11 additions & 0 deletions spec/models/structure_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ def mock_geo_api(departement, code_region, region)
it { expect(structure.errors[:siret]).to be_blank }
end

context 'quand il est un siret valide avec des espaces' do
let(:structure) { build :structure, siret: '1234567890 1234' }

before { structure.valid? }

it do
expect(structure.errors[:siret]).to be_blank
expect(structure.siret).to eq('12345678901234')
end
end

context 'quand il est un siret valide (14 chiffres)' do
let(:structure) { build :structure, siret: '12345678901234' }

Expand Down