diff --git a/lib/Alchemy/Phrasea/Controller/Prod/Export.php b/lib/Alchemy/Phrasea/Controller/Prod/Export.php index b4bcf7b87f..94edf99897 100644 --- a/lib/Alchemy/Phrasea/Controller/Prod/Export.php +++ b/lib/Alchemy/Phrasea/Controller/Prod/Export.php @@ -297,7 +297,7 @@ class Export implements ControllerProviderInterface $mail->setButtonUrl($url); $mail->setExpiration($endDateObject); - $app['notification.deliverer']->deliver($mail); + $app['notification.deliverer']->deliver($mail, !!$request->request->get('reading_confirm', false)); unset($remaingEmails[$key]); } diff --git a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php index a9abce7441..675e35ba17 100644 --- a/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php +++ b/lib/Alchemy/Phrasea/Core/Provider/RegistrationServiceProvider.php @@ -77,7 +77,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface ), 'address' => array( 'label' => _('admin::compte-utilisateur adresse'), - 'type' => 'textarea', + 'type' => 'text', 'constraints' => array( new Assert\NotBlank(), ) @@ -96,7 +96,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface new Assert\NotBlank(), ) ), - 'position' => array( + 'job' => array( 'label' => _('admin::compte-utilisateur poste'), 'type' => 'text', 'constraints' => array( @@ -110,7 +110,7 @@ class RegistrationServiceProvider implements ServiceProviderInterface new Assert\NotBlank(), ) ), - 'job' => array( + 'position' => array( 'label' => _('admin::compte-utilisateur activite'), 'type' => 'text', 'constraints' => array( diff --git a/templates/web/admin/setup.html.twig b/templates/web/admin/setup.html.twig index 17a1d93564..9ae65cc4aa 100644 --- a/templates/web/admin/setup.html.twig +++ b/templates/web/admin/setup.html.twig @@ -35,7 +35,7 @@ -