diff --git a/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php b/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php new file mode 100644 index 000000000..069ef5385 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/UserJobHistoryController.php @@ -0,0 +1,29 @@ +addOrderBy('e.startDate', 'ASC') + ->addOrderBy('e.id', 'ASC') + ; + + return parent::orderQuery($action, $query, $request, $paginator); + } +} diff --git a/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php b/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php new file mode 100644 index 000000000..5b4e4cb96 --- /dev/null +++ b/src/Bundle/ChillMainBundle/Controller/UserScopeHistoryController.php @@ -0,0 +1,29 @@ +addOrderBy('e.startDate', 'ASC') + ->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 236848435..80febcae9 100644 --- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php +++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php @@ -23,6 +23,8 @@ use Chill\MainBundle\Controller\RegroupmentController; use Chill\MainBundle\Controller\UserController; use Chill\MainBundle\Controller\UserJobApiController; use Chill\MainBundle\Controller\UserJobController; +use Chill\MainBundle\Controller\UserJobHistoryController; +use Chill\MainBundle\Controller\UserScopeHistoryController; use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface; use Chill\MainBundle\Doctrine\DQL\Age; use Chill\MainBundle\Doctrine\DQL\Extract; @@ -375,7 +377,7 @@ class ChillMainExtension extends Extension implements ], [ 'class' => UserJobHistory::class, - //'controller' => UserJobHistoryController::class, + 'controller' => UserJobHistoryController::class, 'name' => 'admin_user_job_history', 'base_path' => '/admin/main/user-job-history', 'base_role' => 'ROLE_ADMIN', @@ -388,7 +390,7 @@ class ChillMainExtension extends Extension implements ], [ 'class' => UserScopeHistory::class, - //'controller' => UserScopeHistoryController::class, + 'controller' => UserScopeHistoryController::class, 'name' => 'admin_user_scope_history', 'base_path' => '/admin/main/user-scope-history', 'base_role' => 'ROLE_ADMIN',