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

2015-09-24 11:17:29 +02:00 · 2015-09-24 11:17:29 +02:00 · 40310da378
commit 40310da378
parent 23d11976a2 8693f4194c
27 changed files with 679 additions and 164 deletions
--- a/app/controllers/users/recapitulatif_controller.rb
+++ b/app/controllers/users/recapitulatif_controller.rb
@ -3,6 +3,7 @@ class Users::RecapitulatifController < UsersController

    @dossier = Dossier.find(params[:dossier_id])
    @dossier = @dossier.decorate
+    @procedure = @dossier.procedure

    # mettre dans le modele
    @commentaires = @dossier.commentaires.order(created_at: :desc)