fix issue with node attributes
This commit is contained in:
parent
5546bfb114
commit
5bc880ee12
|
@ -62,66 +62,82 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
|
||||||
|
|
||||||
if ($node->getDisableUrl()) {
|
if ($node->getDisableUrl()) {
|
||||||
$node->setUrl(null);
|
$node->setUrl(null);
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if ($node->getUrl()) {
|
|
||||||
$generatedUrl = $node->getUrl();
|
|
||||||
} else {
|
} else {
|
||||||
$path = [];
|
if ($node->getUrl()) {
|
||||||
$parent = $node->getParent();
|
$generatedUrl = $node->getUrl();
|
||||||
|
} else {
|
||||||
|
$path = [];
|
||||||
|
$parent = $node->getParent();
|
||||||
|
|
||||||
if ($parent && $parent->getUrl()) {
|
if ($parent && $parent->getUrl()) {
|
||||||
$pPath = trim($parent->getUrl(), '/');
|
$pPath = trim($parent->getUrl(), '/');
|
||||||
|
|
||||||
if ($pPath) {
|
if ($pPath) {
|
||||||
$path[] = $pPath;
|
$path[] = $pPath;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
$path[] = $this->slugify->slugify($node->getLabel());
|
||||||
|
|
||||||
|
$generatedUrl = '/'.implode('/', $path);
|
||||||
|
}
|
||||||
|
|
||||||
|
if ('/' !== $generatedUrl) {
|
||||||
|
$generatedUrl = rtrim($generatedUrl, '/');
|
||||||
|
}
|
||||||
|
|
||||||
|
$parameters = $node->getParameters();
|
||||||
|
$routeParameters = [];
|
||||||
|
|
||||||
|
foreach ($parameters as $key => $parameter) {
|
||||||
|
$parameter['name'] = $this->routeParameterSlugify->slugify($parameter['name']);
|
||||||
|
$routeParameter = sprintf('{%s}', $parameter['name']);
|
||||||
|
$regex = '/'.preg_quote($routeParameter).'/';
|
||||||
|
$routeParameters[] = $parameter['name'];
|
||||||
|
|
||||||
|
if (!preg_match($regex, $generatedUrl)) {
|
||||||
|
$generatedUrl .= '/'.$routeParameter;
|
||||||
|
}
|
||||||
|
|
||||||
|
$parameters[$key] = $parameter;
|
||||||
|
}
|
||||||
|
|
||||||
|
preg_match_all('/\{(.*)\}/isU', $generatedUrl, $matches, PREG_SET_ORDER);
|
||||||
|
|
||||||
|
foreach ($matches as $match) {
|
||||||
|
if (!in_array($match[1], $routeParameters)) {
|
||||||
|
$parameters[] = [
|
||||||
|
'name' => $this->routeParameterSlugify->slugify($match[1]),
|
||||||
|
'defaultValue' => null,
|
||||||
|
'requirement' => null,
|
||||||
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$path[] = $this->slugify->slugify($node->getLabel());
|
if (!u($generatedUrl)->startsWith('https://') && !u($generatedUrl)->startsWith('http://')) {
|
||||||
|
$generatedUrl = str_replace('//', '/', $generatedUrl);
|
||||||
$generatedUrl = '/'.implode('/', $path);
|
|
||||||
}
|
|
||||||
|
|
||||||
if ('/' !== $generatedUrl) {
|
|
||||||
$generatedUrl = rtrim($generatedUrl, '/');
|
|
||||||
}
|
|
||||||
|
|
||||||
$parameters = $node->getParameters();
|
|
||||||
$routeParameters = [];
|
|
||||||
|
|
||||||
foreach ($parameters as $key => $parameter) {
|
|
||||||
$parameter['name'] = $this->routeParameterSlugify->slugify($parameter['name']);
|
|
||||||
$routeParameter = sprintf('{%s}', $parameter['name']);
|
|
||||||
$regex = '/'.preg_quote($routeParameter).'/';
|
|
||||||
$routeParameters[] = $parameter['name'];
|
|
||||||
|
|
||||||
if (!preg_match($regex, $generatedUrl)) {
|
|
||||||
$generatedUrl .= '/'.$routeParameter;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$parameters[$key] = $parameter;
|
$node->setParameters($parameters);
|
||||||
}
|
|
||||||
|
|
||||||
preg_match_all('/\{(.*)\}/isU', $generatedUrl, $matches, PREG_SET_ORDER);
|
$urlExists = $this->nodeRepository->urlExists($generatedUrl, $node);
|
||||||
|
|
||||||
foreach ($matches as $match) {
|
if ($urlExists) {
|
||||||
if (!in_array($match[1], $routeParameters)) {
|
$number = 1;
|
||||||
$parameters[] = [
|
|
||||||
'name' => $this->routeParameterSlugify->slugify($match[1]),
|
while ($this->nodeRepository->urlExists($generatedUrl.'-'.$number, $node)) {
|
||||||
'defaultValue' => null,
|
++$number;
|
||||||
'requirement' => null,
|
}
|
||||||
];
|
|
||||||
|
$generatedUrl = $generatedUrl.'-'.$number;
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!u($generatedUrl)->startsWith('https://') && !u($generatedUrl)->startsWith('http://')) {
|
if (!u($generatedUrl)->startsWith('/')) {
|
||||||
$generatedUrl = str_replace('//', '/', $generatedUrl);
|
$generatedUrl = '/'.$generatedUrl;
|
||||||
}
|
}
|
||||||
|
|
||||||
$node->setParameters($parameters);
|
$node->setUrl($generatedUrl);
|
||||||
|
}
|
||||||
|
|
||||||
$attributes = $node->getAttributes();
|
$attributes = $node->getAttributes();
|
||||||
$realAttributes = [];
|
$realAttributes = [];
|
||||||
|
@ -131,24 +147,6 @@ class NodeEventSubscriber extends EntityManagerEventSubscriber
|
||||||
}
|
}
|
||||||
|
|
||||||
$node->setAttributes($realAttributes);
|
$node->setAttributes($realAttributes);
|
||||||
|
|
||||||
$urlExists = $this->nodeRepository->urlExists($generatedUrl, $node);
|
|
||||||
|
|
||||||
if ($urlExists) {
|
|
||||||
$number = 1;
|
|
||||||
|
|
||||||
while ($this->nodeRepository->urlExists($generatedUrl.'-'.$number, $node)) {
|
|
||||||
++$number;
|
|
||||||
}
|
|
||||||
|
|
||||||
$generatedUrl = $generatedUrl.'-'.$number;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!u($generatedUrl)->startsWith('/')) {
|
|
||||||
$generatedUrl = '/'.$generatedUrl;
|
|
||||||
}
|
|
||||||
|
|
||||||
$node->setUrl($generatedUrl);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public function onDelete(EntityManagerEvent $event)
|
public function onDelete(EntityManagerEvent $event)
|
||||||
|
|
Loading…
Reference in a new issue