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

Merge pull request #790 from sgmap/fix_tests_with_commentaires_order

Browse source 
Force commentaire order to avoid tests to fail randomly
This commit is contained in:
gregoirenovel 2017-10-06 11:11:45 +02:00 • committed by GitHub
commit 1ff7dfe264
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/commentaire.rb
View file

@ -4,7 +4,7 @@ class Commentaire < ActiveRecord::Base
belongs_to :piece_justificative belongs_to :piece_justificative
scope :ordered, -> { order(created_at: :asc) } default_scope { order(created_at: :asc) }
after_create :notify after_create :notify

2
app/views/new_gestionnaire/avis/messagerie.html.haml
View file

@ -2,7 +2,7 @@
.messagerie.container .messagerie.container
%ul %ul
- @dossier.commentaires.ordered.each do |commentaire| - @dossier.commentaires.each do |commentaire|
%li %li
= render partial: 'new_gestionnaire/dossiers/commentaire_icon', locals: { commentaire: commentaire, current_gestionnaire: current_gestionnaire } = render partial: 'new_gestionnaire/dossiers/commentaire_icon', locals: { commentaire: commentaire, current_gestionnaire: current_gestionnaire }

2
app/views/new_gestionnaire/dossiers/messagerie.html.haml
View file

@ -2,7 +2,7 @@
.messagerie.container .messagerie.container
%ul %ul
- @dossier.commentaires.ordered.each do |commentaire| - @dossier.commentaires.each do |commentaire|
%li %li
= render partial: 'commentaire_icon', locals: { commentaire: commentaire, current_gestionnaire: current_gestionnaire } = render partial: 'commentaire_icon', locals: { commentaire: commentaire, current_gestionnaire: current_gestionnaire }