From 9d012d51e8acde4c05040d6436d1cde2d16a4a06 Mon Sep 17 00:00:00 2001 From: "Ismael MOUSSA S. (T0194673)" Date: Tue, 7 Sep 2021 10:49:20 +0200 Subject: [PATCH 1/2] delete features flag option : 'make_experts_notifiable' --- config/initializers/flipper.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb index 07f7db25d..721bfb00b 100644 --- a/config/initializers/flipper.rb +++ b/config/initializers/flipper.rb @@ -31,7 +31,6 @@ features = [ :expert_not_allowed_to_invite, :hide_instructeur_email, :instructeur_bypass_email_login_token, - :make_experts_notifiable, :procedure_revisions, :procedure_routage_api, :procedure_process_expired_dossiers_termine From 084e48c8e3c5ef1de1882c909e51ea3442db6df0 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Tue, 7 Sep 2021 14:07:55 +0200 Subject: [PATCH 2/2] fix(dossier_projection_service): select external_id on champs --- app/services/dossier_projection_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/dossier_projection_service.rb b/app/services/dossier_projection_service.rb index 8a2a43ed5..c88c5a7e9 100644 --- a/app/services/dossier_projection_service.rb +++ b/app/services/dossier_projection_service.rb @@ -33,7 +33,7 @@ class DossierProjectionService types_de_champ: { stable_id: fields.map { |f| f[COLUMN] } }, dossier_id: dossiers_ids ) - .select(:dossier_id, :value, :type_de_champ_id, :stable_id, :type, :data) # we cannot pluck :value, as we need the champ.to_s method + .select(:dossier_id, :value, :type_de_champ_id, :stable_id, :type, :external_id, :data) # we cannot pluck :value, as we need the champ.to_s method .group_by(&:stable_id) # the champs are redispatched to their respective fields .map do |stable_id, champs| field = fields.find { |f| f[COLUMN] == stable_id.to_s }