DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5255 from betagouv/dev

Browse source 
2020-06-11-02
This commit is contained in:
krichtof 2020-06-11 13:21:45 +02:00 • committed by GitHub
commit 908639b4fe
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile.lock
View file

@ -245,7 +245,7 @@ GEM
et-orbi (~> 1.1, >= 1.1.8) et-orbi (~> 1.1, >= 1.1.8)
raabro (~> 1.1) raabro (~> 1.1)
geo_coord (0.1.0) geo_coord (0.1.0)
geocoder (1.6.0) geocoder (1.6.1)
globalid (0.4.2) globalid (0.4.2)
activesupport (>= 4.2.0) activesupport (>= 4.2.0)
gon (6.3.2) gon (6.3.2)

2
app/models/groupe_instructeur.rb
View file

@ -4,7 +4,7 @@ class GroupeInstructeur < ApplicationRecord
has_many :assign_tos, dependent: :destroy has_many :assign_tos, dependent: :destroy
has_many :instructeurs, through: :assign_tos has_many :instructeurs, through: :assign_tos
has_many :dossiers has_many :dossiers
has_and_belongs_to_many :exports has_and_belongs_to_many :exports, dependent: :destroy
validates :label, presence: { message: 'doit être renseigné' }, allow_nil: false validates :label, presence: { message: 'doit être renseigné' }, allow_nil: false
validates :label, uniqueness: { scope: :procedure, message: 'existe déjà' } validates :label, uniqueness: { scope: :procedure, message: 'existe déjà' }