Merge branch 'features/activity-type' into features/activity-form

This commit is contained in:
Jean-Francois Monfort 2021-04-15 14:46:08 +02:00
commit 68d9778c00

View File

@ -99,7 +99,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
[
'class' => \Chill\ActivityBundle\Entity\ActivityType::class,
'name' => 'activity_type',
'base_path' => '/admin/activity_type',
'base_path' => '/admin/activity/type',
'form_class' => \Chill\ActivityBundle\Form\ActivityTypeType::class,
'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeController::class,
'actions' => [
@ -120,7 +120,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
[
'class' => \Chill\ActivityBundle\Entity\ActivityTypeCategory::class,
'name' => 'activity_type_category',
'base_path' => '/admin/activity_type_category',
'base_path' => '/admin/activity/type_category',
'form_class' => \Chill\ActivityBundle\Form\ActivityTypeCategoryType::class,
'controller' => \Chill\ActivityBundle\Controller\AdminActivityTypeCategoryController::class,
'actions' => [