|
@@ -188,7 +188,7 @@ discard block |
|
|
block discarded – undo |
|
188
|
188
|
$Member = $this->requestContext->getCurrentUser(); |
|
189
|
189
|
if ($Member instanceof Member) { |
|
190
|
190
|
$AuthorityRoles = $this->authorityRoleRepository->findBy(['Authority' => $Member->getAuthority()]); |
|
191
|
|
- $baseUrl = $event->getRequest()->getBaseUrl() . '/' . $this->eccubeConfig['eccube_admin_route']; |
|
|
191
|
+ $baseUrl = $event->getRequest()->getBaseUrl().'/'.$this->eccubeConfig['eccube_admin_route']; |
|
192
|
192
|
$eccubeNav = $this->getDisplayEccubeNav($eccubeNav, $AuthorityRoles, $baseUrl); |
|
193
|
193
|
} |
|
194
|
194
|
$this->twig->addGlobal('eccubeNav', $eccubeNav); |
|
@@ -219,7 +219,7 @@ discard block |
|
|
block discarded – undo |
|
219
|
219
|
$param = array_key_exists('param', $childNav) ? $childNav['param'] : []; |
|
220
|
220
|
$url = $this->router->generate($childNav['url'], $param); |
|
221
|
221
|
foreach ($AuthorityRoles as $AuthorityRole) { |
|
222
|
|
- $denyUrl = str_replace('/', '\/', $baseUrl . $AuthorityRole->getDenyUrl()); |
|
|
222
|
+ $denyUrl = str_replace('/', '\/', $baseUrl.$AuthorityRole->getDenyUrl()); |
|
223
|
223
|
if (preg_match("/^({$denyUrl})/i", $url)) { |
|
224
|
224
|
// 権限がないURLの場合は配列から削除 |
|
225
|
225
|
unset($parentNav[$key]); |
Please login to merge, or discard this patch.