DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity
12810 commits 250 branches 1166 tags 78 MiB
Commit graph

12810 commits

This branch
This branch
All branches
Author SHA1 Message Date
simon lehericey
c5f6c9ae1e fix missing state translation 2021-05-10 11:17:34 +02:00
LeSim
c639268e74
Merge pull request #6188 from adullact/6187_fix_spec_api-entreprise_exercices-job 
#6187 - Fix(API Entreprise): test fails randomly
 2021-05-10 11:17:01 +02:00
François Vantomme
99ce5195bc Fix (API Entreprise): test fails randomly 
Don't assume array order, just check that all values are present
 2021-05-07 17:42:15 +02:00
LeSim
03acf89fa7
Merge pull request #6185 from betagouv/main 
2021-05-07-01
 2021-05-07 12:10:23 +02:00
LeSim
656068e53f
Merge pull request #6184 from betagouv/bump_administrate 
update administrate
 2021-05-07 11:25:39 +02:00
simon lehericey
19aefa1fd0 update administrate 2021-05-07 11:15:22 +02:00
Paul Chavard
611afa2014
Merge pull request #6181 from tchak/fix-smtp-config 
Use explicit name to avoid unknown constant errors
 2021-05-06 16:31:54 +02:00
Paul Chavard
e8cdded515 Use explicit name to avoid unknown constant errors 2021-05-06 16:10:48 +02:00
Pierre de La Morinerie
65a280660d
Merge pull request #6177 from betagouv/remove-older-after-party-tasks 
Suppression des tâches de déploiement `after_party` les plus anciennes (#6177)
 2021-05-06 15:28:05 +02:00
Pierre de La Morinerie
77b65f3aa0 tasks: remove older after_party tasks 2021-05-06 15:19:37 +02:00
Pierre de La Morinerie
9fd42a809f
Merge pull request #6180 from betagouv/fix-administrate-translation 
SuperAdmin : correction de l'affichage de la page `/manager/dossiers`
 2021-05-06 15:18:52 +02:00
Pierre de La Morinerie
b398485d97 manager: localize dossier enums 
In the previous commit, we cleaned up the localization of the
Dossier.state enum. This prevented administrate from crashing, but now
the dossier enum are no longer localized in the Manager.

By using a `Field::Enum` type, we instruct the administrate plugin
to look up our localized name for the Dossier state enum.
 2021-05-06 14:41:08 +02:00
Pierre de La Morinerie
b8f71bd52c i18n: fix enum values for Dossier.state 
According to Rails i18n guide, enum values should be localized
as `<model>/<enum>`, not as sub-values to the attribute.

This fixes an exception in administrate when displaying a Dossier
in the Manager.

Note: we need to change the way GraphQL attributes are generated, because
`AASM::Core::State#display_name` doesn’t honor the `model/attribute.value`
convention (and instead tries to localize as `model.attribute/value`).
So instead we lookup the localized name using ActiveRecord.
 2021-05-06 14:38:25 +02:00
Pierre de La Morinerie
752401a18a
Merge pull request #6179 from betagouv/main 
2021-05-06-01
 2021-05-06 11:40:02 +02:00
Pierre de La Morinerie
fb75f9d133
Merge pull request #6178 from betagouv/fix-manager 
SuperAdmin : réparation du manager après la mise à jour à Rails 6.1.3.2 (#6178)
 2021-05-06 11:28:34 +02:00
Pierre de La Morinerie
ce6a27d416 manager: upgrade administrate to be compatible with Rails 6.1.3.2 
Rails 6.1.3.2 is a security upgrade, and we had to upgrade quickly.
Unfortunately that broke the administrate gem.

A PR has been opened to fix the issues with the newest Rails version,
and will probably be merged quickly. Meanwhile we can fix the manager
by using the version from the PR for now.

Once the PR is merged and a new version of administrate is released,
we can use a released version of administrate again.
 2021-05-06 11:17:17 +02:00
Pierre de La Morinerie
dc33f4a395 manager: use administrate helper to retrieve resource path 
This is lifted from the current default template provided by
administrate.
 2021-05-06 11:11:04 +02:00
krichtof
b39b43179d
Merge pull request #6171 from betagouv/6132-fix-broken-link 
corrige le lien annuaire lorsque le siren n'est pas connu
 2021-05-06 10:07:32 +02:00
Christophe Robillard
6086f05524 corrige le lien annuaire lorsque le siren n'est pas connu 2021-05-06 09:59:27 +02:00
Pierre de La Morinerie
225fadbdf8
Merge pull request #6135 from betagouv/small_style_fixes 
Instructeur : petites améliorations de l'interface du tableau de bord d'une démarche (#6135)
 2021-05-06 09:22:13 +02:00
simon lehericey
55b80df29d display count before text in tabs 2021-05-06 09:13:20 +02:00
simon lehericey
f55c6ee371 stick arrow with label 2021-05-06 09:13:20 +02:00
Paul Chavard
924ce114f4
Merge pull request #6164 from tchak/custom-smtp 
Use HELO (custom dev SMTP)
 2021-05-06 09:07:44 +02:00
Paul Chavard
327bec0637 Use HELO 2021-05-06 08:59:18 +02:00
LeSim
1bcc52cab4
Merge pull request #6176 from betagouv/main 
2021-05-05-02
 2021-05-05 21:46:35 +02:00
LeSim
a261801a41
Merge pull request #6174 from betagouv/update_rails 
go to rails 6.1.3.2
 2021-05-05 21:45:03 +02:00
simon lehericey
5124e08ccd disable faulty manager spec 2021-05-05 21:34:57 +02:00
simon lehericey
6dd3dd24a4 go to rails 6.1.3.2 2021-05-05 20:54:36 +02:00
LeSim
b01e4fc8b5
Merge pull request #6173 from betagouv/main 
2021-05-05-01
 2021-05-05 17:58:39 +02:00
LeSim
580c5c4ede
Merge pull request #6167 from betagouv/profiler4dev 
activate rack_mini_profiler in dev
 2021-05-05 17:24:44 +02:00
Christophe Robillard
2516abc277 activate rack_mini_profiler in dev and display query count 2021-05-05 17:16:10 +02:00
LeSim
9f8121247f
Merge pull request #6086 from betagouv/add_missing_fci_constraints 
[#6084] rajoute des contraintes manquantes à la table france_connect_informations
 2021-05-05 15:41:42 +02:00
simon lehericey
ccce724976 refactor as created fci must have an user_id 2021-05-05 14:36:34 +02:00
simon lehericey
e18fb116c6 cannot create fci without user 2021-05-05 14:36:34 +02:00
simon lehericey
8d0082419c do not know how it worked before 2021-05-05 14:36:34 +02:00
simon lehericey
9dc9e92c16 use the with_user trait in feature 2021-05-05 14:28:20 +02:00
simon lehericey
1cf59f722e add :with_user trait to fci as user_id is mandatory 2021-05-05 14:28:20 +02:00
simon lehericey
ed404f129b remove now falling spec of obsolete task 2021-05-05 14:28:20 +02:00
simon lehericey
4dc314d24b [fix #6084] add db constraints to france_connect_informations table 2021-05-05 14:28:20 +02:00
Pierre de La Morinerie
b7faed96a3
Merge pull request #6169 from betagouv/fix_duplicate_dossier 
Instructeur : corrige une duplication des dossiers dans le tableau d'une démarche (#6169)
 2021-05-04 16:47:57 +02:00
krichtof
239f776e5d
Merge pull request #6172 from betagouv/main 
2021-05-04-01
 2021-05-04 16:47:27 +02:00
simon lehericey
9fd1c604a1 display follower instructeur emails in alphabetic order 2021-05-04 16:38:34 +02:00
simon lehericey
50f679746f do not extract twice the same dossier_id if the dossier is followed twice 2021-05-04 16:38:34 +02:00
krichtof
ef8745fb10
Merge pull request #6170 from tchak/revert_enable_brouillon_extend_conservation 
Revert "Merge pull request #6142 from tchak/enable_brouillon_extend_conservation"
 2021-05-04 16:20:49 +02:00
Paul Chavard
bcbfcdc537 Revert "Merge pull request #6142 from tchak/enable_brouillon_extend_conservation" 
This reverts commit 48eb4d9778, reversing
changes made to 5539d5cb8c.

# Conflicts:
#	app/models/dossier.rb
#	db/schema.rb
 2021-05-04 16:03:29 +02:00
krichtof
4cba6e3b11
Merge pull request #6165 from betagouv/optim_vue_dossier_instructeur 
prend en compte uniquement les pj pour estimer la taille d'un dossier
 2021-05-04 12:59:31 +02:00
Christophe Robillard
01f180022b prend en compte uniquement les pj pour estimer la taille d'un dossier 2021-05-04 12:50:12 +02:00
Paul Chavard
71a48c99bb
Merge pull request #6108 from tchak/enable-user-destruction 
Enable user destruction
 2021-05-04 12:31:02 +02:00
Paul Chavard
f6508899de Refactor NotificationMailer 2021-05-04 12:05:06 +02:00
Paul Chavard
a4fd629f4a Enable user destruction 2021-05-04 12:05:06 +02:00