diff --git a/CHANGELOG.md b/CHANGELOG.md index 096809844..4afdffe7a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ and this project adheres to * [admin] add admin section for languages and countries (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/596) * [activity] activity admin: translations + remove label field for comment on admin activity type (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/587) +* [main] admin user_job: improvements (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/588) * [person] prevent circular references in PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/527) * [person] add maritalStatusComment to PersonDocGenNormalizer (https://gitlab.com/champs-libres/departement-de-la-vendee/chill/-/issues/582) diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobController.php b/src/Bundle/ChillMainBundle/Controller/UserJobController.php new file mode 100644 index 000000000..0c1fd4b3d --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/UserJobController.php @@ -0,0 +1,26 @@ +addOrderBy('e.id', 'ASC'); + + return parent::orderQuery($action, $query, $request, $paginator); + } +} diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php index a62ca88f3..0611b9848 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -19,6 +19,7 @@ use Chill\MainBundle\Controller\LanguageController; use Chill\MainBundle\Controller\LocationController; use Chill\MainBundle\Controller\LocationTypeController; use Chill\MainBundle\Controller\UserController; +use Chill\MainBundle\Controller\UserJobController; use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface; use Chill\MainBundle\Doctrine\DQL\GetJsonFieldByKey; use Chill\MainBundle\Doctrine\DQL\JsonAggregate; @@ -308,6 +309,7 @@ class ChillMainExtension extends Extension implements 'cruds' => [ [ 'class' => UserJob::class, + 'controller' => UserJobController::class, 'name' => 'admin_user_job', 'base_path' => '/admin/main/user-job', 'base_role' => 'ROLE_ADMIN', diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig index 4d55c480c..28678bf6d 100644 --- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig +++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/edit.html.twig @@ -8,4 +8,4 @@ {% embed '@ChillMain/CRUD/_edit_content.html.twig' %} {% block content_form_actions_save_and_show %}{% endblock %} {% endembed %} -{% endblock admin_content %} +{% endblock admin_content %} \ No newline at end of file