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

feat(export): can sort by revision first, instead of mixing revisions

Browse source
This commit is contained in:
Colin Darie 2023-12-22 16:32:21 +01:00
parent d69dc6e2c9
commit 58c00b2d4e
No known key found for this signature in database
GPG key ID: 8C76CADD40253590
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/models/procedure.rb
View file

@ -104,8 +104,13 @@ class Procedure < ApplicationRecord
TypeDeChamp TypeDeChamp
.joins(:revision_types_de_champ) .joins(:revision_types_de_champ)
.where(revision_types_de_champ: { id: recents_prtdc }) .where(revision_types_de_champ: { id: recents_prtdc }).then do |relation|
.order(:private, :position, 'revision_types_de_champ.revision_id': :desc) if feature_enabled?(:export_order_by_revision) # Fonds Verts, en attente d'exports personnalisables
relation.order(:private, 'revision_types_de_champ.revision_id': :desc, position: :asc)
else
relation.order(:private, :position, 'revision_types_de_champ.revision_id': :desc)
end
end
end end
end end