From 4f94bd56406bdb55ce27d9ca3064221f16a7835e Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 19 Jul 2023 21:24:15 +0200 Subject: [PATCH 1/6] add user admin controller and simples views in default files --- src/Controller/UserAdminController.php | 79 ++++++++++++++++++++++ templates/admin/user_admin/_form.html.twig | 1 + templates/admin/user_admin/_show.html.twig | 1 + 3 files changed, 81 insertions(+) create mode 100644 src/Controller/UserAdminController.php create mode 100644 templates/admin/user_admin/_form.html.twig create mode 100644 templates/admin/user_admin/_show.html.twig diff --git a/src/Controller/UserAdminController.php b/src/Controller/UserAdminController.php new file mode 100644 index 0000000..d701a9b --- /dev/null +++ b/src/Controller/UserAdminController.php @@ -0,0 +1,79 @@ + '\d+'])] + public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response + { + return parent::index($page, $query, $request, $session); + } + + #[Route(path: '/admin/user/new', name: 'admin_user_new', methods: ['GET', 'POST'])] + public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response + { + return parent::new($factory->create(null, $tokenGenerator->generateToken()), $entityManager, $request); + } + + #[Route(path: '/admin/user/show/{entity}', name: 'admin_user_show', methods: ['GET'])] + public function show(Entity $entity): Response + { + return parent::show($entity); + } + + #[Route(path: '/admin/user/filter', name: 'admin_user_filter', methods: ['GET'])] + public function filter(Session $session): Response + { + return parent::filter($session); + } + + #[Route(path: '/admin/user/edit/{entity}', name: 'admin_user_edit', methods: ['GET', 'POST'])] + public function edit(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::edit($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/inline_edit/{entity}/{context}/{label}', name: 'admin_user_inline_edit', methods: ['GET', 'POST'])] + public function inlineEdit(string $context, string $label, Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::inlineEdit($context, $label, $entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/delete/{entity}', name: 'admin_user_delete', methods: ['DELETE', 'POST'])] + public function delete(Entity $entity, EntityManager $entityManager, Request $request): Response + { + return parent::delete($entity, $entityManager, $request); + } + + #[Route(path: '/admin/user/resetting_request/{entity}', name: 'admin_user_resetting_request', methods: ['POST'])] + public function requestResetting(Entity $entity, EventDispatcherInterface $eventDispatcher, Request $request): Response + { + return parent::requestResetting($entity, $eventDispatcher, $request); + } + + protected function getConfiguration(): CrudConfiguration + { + if ($this->configuration) { + return $this->configuration; + } + + return parent::getConfiguration() + ->setView('form', 'admin/user_admin/_form.html.twig') + ->setView('show_entity', 'admin/user_admin/_show.html.twig') + ; + } +} diff --git a/templates/admin/user_admin/_form.html.twig b/templates/admin/user_admin/_form.html.twig new file mode 100644 index 0000000..ed04750 --- /dev/null +++ b/templates/admin/user_admin/_form.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_form.html.twig') }} diff --git a/templates/admin/user_admin/_show.html.twig b/templates/admin/user_admin/_show.html.twig new file mode 100644 index 0000000..806f07d --- /dev/null +++ b/templates/admin/user_admin/_show.html.twig @@ -0,0 +1 @@ +{{ include('@Core/user/user_admin/_show.html.twig') }} From cc0296e6e279e4e6389d8621f81a39801c7f9adf Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Wed, 19 Jul 2023 21:29:52 +0200 Subject: [PATCH 2/6] fix user crud controllers --- src/Controller/UserAdminController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Controller/UserAdminController.php b/src/Controller/UserAdminController.php index d701a9b..9970f51 100644 --- a/src/Controller/UserAdminController.php +++ b/src/Controller/UserAdminController.php @@ -20,13 +20,13 @@ class UserAdminController extends BaseUserAdminController #[Route(path: '/admin/user/{page}', name: 'admin_user_index', methods: ['GET'], requirements: ['page' => '\d+'])] public function index(RepositoryQuery $query, Request $request, Session $session, int $page = 1): Response { - return parent::index($page, $query, $request, $session); + return parent::index($query, $request, $session, $page); } #[Route(path: '/admin/user/new', name: 'admin_user_new', methods: ['GET', 'POST'])] public function new(Factory $factory, EntityManager $entityManager, Request $request, TokenGenerator $tokenGenerator): Response { - return parent::new($factory->create(null, $tokenGenerator->generateToken()), $entityManager, $request); + return parent::new($factory, $entityManager, $request, $tokenGenerator); } #[Route(path: '/admin/user/show/{entity}', name: 'admin_user_show', methods: ['GET'])] From 8c6ad05cbd54689fbc9409bd799f14888f98fd47 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 20 Jul 2023 09:21:17 +0200 Subject: [PATCH 3/6] add chdir in the console entrypoint --- bin/console | 2 ++ 1 file changed, 2 insertions(+) diff --git a/bin/console b/bin/console index c933dc5..9906041 100755 --- a/bin/console +++ b/bin/console @@ -10,6 +10,8 @@ if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) { require_once dirname(__DIR__).'/vendor/autoload_runtime.php'; +chdir(__DIR__.'/../'); + return function (array $context) { $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']); From dbec7a884ea682da948e5eee3cf2f51f0daeeec3 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 20 Jul 2023 09:47:12 +0200 Subject: [PATCH 4/6] update changelog --- CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8e822cd..3ebbaf2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ ## [Unreleased] +## [1.20.0] 2023-07-20 +### added +* add user admin controller and simples views in default files +* add chdir in the console entrypoint +### Changed +* upgrade murph/murph-core + ## [1.19.0] 2023-04-15 ### Changed * upgrade murph/murph-core From 67871179a8e9e359260cde3553c132d581dba335 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 27 Jul 2023 18:16:36 +0200 Subject: [PATCH 5/6] update murph --- CHANGELOG.md | 5 +++-- composer.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3ebbaf2..5b089ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,8 @@ ## [Unreleased] -## [1.20.0] 2023-07-20 -### added +### Fixed +* fix collection widget: allow_add/allow_delete and prototype +### Added * add user admin controller and simples views in default files * add chdir in the console entrypoint ### Changed diff --git a/composer.json b/composer.json index 20be811..c432d5c 100644 --- a/composer.json +++ b/composer.json @@ -7,7 +7,7 @@ "prefer-stable": true, "require": { "php": ">=8.0.0", - "murph/murph-core": "^1.19" + "murph/murph-core": "^1.20" }, "require-dev": { "symfony/browser-kit": "^5.4", From 627927a11ebaeb85c0954bbbd57c013d64a9009b Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Thu, 27 Jul 2023 18:17:15 +0200 Subject: [PATCH 6/6] update murph --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5b089ab..214bb0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ ## [Unreleased] +## [1.20.0] 2023-07-27 ### Fixed * fix collection widget: allow_add/allow_delete and prototype ### Added