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

Merge branch 'develop' of ssh://37.187.249.111:2200/opt/git/tps into develop

Browse source 
Conflicts:
	db/schema.rb
This commit is contained in:
Tanguy PATTE 2015-09-22 11:57:04 +02:00
commit 9da4a33e62
6 changed files with 37 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/controllers/dossiers_controller.rb
View file

@ -14,7 +14,8 @@ class DossiersController < ApplicationController
@entreprise = Entreprise.new(SIADE::EntrepriseAdapter.new(siren).to_params)
@dossier = Dossier.create
@dossier.procedure_id
@dossier.procedure = Procedure.find(params['procedure_id'])
@dossier.save
@entreprise.dossier = @dossier
@entreprise.save

4
app/models/procedure.rb
View file

@ -2,4 +2,8 @@ class Procedure < ActiveRecord::Base
has_many :types_de_piece_justificative
has_many :dossiers
belongs_to :evenement_vie
validates :libelle, presence: true, allow_blank: false, allow_nil: false
validates :description, presence: true, allow_blank: false, allow_nil: false
validates :lien_demarche, presence: true, allow_blank: false, allow_nil: false
end