mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-26 19:58:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed exception on visiting certain group edit pages.

Browse source 
This fixes issue #340
This commit is contained in:
Jan Böhmer 2023-08-01 15:06:44 +02:00
parent 05d73d2f68
commit b5c0f37f88
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/Services/EntityURLGenerator.php
View file

@ -214,13 +214,13 @@ class EntityURLGenerator
/** /**
* Generates an URL to a page, where this entity can be edited. * Generates an URL to a page, where this entity can be edited.
* *
* @param mixed $entity The entity for which the edit link should be generated * @param AbstractDBElement $entity The entity for which the edit link should be generated
* *
* @return string the URL to the edit page * @return string the URL to the edit page
* *
* @throws EntityNotSupportedException If the method is not supported for the given Entity * @throws EntityNotSupportedException If the method is not supported for the given Entity
*/ */
public function editURL(mixed $entity): string public function editURL(AbstractDBElement $entity): string
{ {
$map = [ $map = [
Part::class => 'part_edit', Part::class => 'part_edit',
@ -244,13 +244,14 @@ class EntityURLGenerator
/** /**
* Generates an URL to a page, where a entity of this type can be created. * Generates an URL to a page, where a entity of this type can be created.
* *
* @param mixed $entity The entity for which the link should be generated * @param AbstractDBElement|string $entity The entity (or the entity class) for which the link should be generated
* @phpstan-param AbstractDBElement|class-string<AbstractDBElement> $entity
* *
* @return string the URL to the page * @return string the URL to the page
* *
* @throws EntityNotSupportedException If the method is not supported for the given Entity * @throws EntityNotSupportedException If the method is not supported for the given Entity
*/ */
public function createURL(mixed $entity): string public function createURL(AbstractDBElement|string $entity): string
{ {
$map = [ $map = [
Part::class => 'part_new', Part::class => 'part_new',
@ -352,21 +353,26 @@ class EntityURLGenerator
* Throws an exception if the entity class is not known to the map. * Throws an exception if the entity class is not known to the map.
* *
* @param array $map The map that should be used for determing the controller * @param array $map The map that should be used for determing the controller
* @param mixed $entity The entity for which the controller name should be determined * @param AbstractDBElement|string $entity The entity for which the controller name should be determined
* @phpstan-param AbstractDBElement|class-string<AbstractDBElement> $entity
* *
* @return string The name of the controller fitting the entity class * @return string The name of the controller fitting the entity class
* *
* @throws EntityNotSupportedException * @throws EntityNotSupportedException
*/ */
protected function mapToController(array $map, mixed $entity): string protected function mapToController(array $map, string|AbstractDBElement $entity): string
{ {
$class = $entity::class; if (is_string($entity)) { //If a class name was already passed, then use it directly
$class = $entity;
} else { //Otherwise get the class name from the entity
$class = $entity::class;
}
//Check if we have an direct mapping for the given class //Check if we have an direct mapping for the given class
if (!array_key_exists($class, $map)) { if (!array_key_exists($class, $map)) {
//Check if we need to check inheritance by looping through our map //Check if we need to check inheritance by looping through our map
foreach (array_keys($map) as $key) { foreach (array_keys($map) as $key) {
if (is_a($entity, $key)) { if (is_a($entity, $key, true)) {
return $map[$key]; return $map[$key];
} }
} }

3
src/Services/Trees/TreeViewGenerator.php
View file

@ -77,7 +77,8 @@ class TreeViewGenerator
//When we use the newEdit type, add the New Element node. //When we use the newEdit type, add the New Element node.
if ('newEdit' === $mode) { if ('newEdit' === $mode) {
//Generate the url for the new node //Generate the url for the new node
$href = $this->urlGenerator->createURL(new $class()); //DO NOT try to create an object from the class, as this might be an proxy, which can not be easily initialized, so just pass the class_name directly
$href = $this->urlGenerator->createURL($class);
$new_node = new TreeViewNode($this->translator->trans('entity.tree.new'), $href); $new_node = new TreeViewNode($this->translator->trans('entity.tree.new'), $href);
//When the id of the selected element is null, then we have a new element, and we need to select "new" node //When the id of the selected element is null, then we have a new element, and we need to select "new" node
if (!$selectedElement instanceof AbstractDBElement || null === $selectedElement->getID()) { if (!$selectedElement instanceof AbstractDBElement || null === $selectedElement->getID()) {