Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-06 21:35:49 +01:00
Code Issues Packages Projects Releases Activity

When creating first user, authorize against admin.login, not site.login

Browse Source
This commit is contained in:
Matias Griese
2018-05-23 09:11:30 +03:00
parent 8f58c71141
commit 15f4ae8b11
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
admin.php
View File

@@ -249,7 +249,7 @@ class AdminPlugin extends Plugin
unset($this->grav['user']); unset($this->grav['user']);
$this->grav['user'] = $user; $this->grav['user'] = $user;
$user->authenticated = true; $user->authenticated = true;
$user->authorized = $user->authorize('site.login'); $user->authorized = $user->authorize('admin.login');
$messages = $this->grav['messages']; $messages = $this->grav['messages'];
$messages->add($this->grav['language']->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info'); $messages->add($this->grav['language']->translate('PLUGIN_ADMIN.LOGIN_LOGGED_IN'), 'info');
@@ -457,6 +457,7 @@ class AdminPlugin extends Plugin
$twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/'; $twig->twig_vars['base_url_relative_frontend'] = $twig->twig_vars['base_url_relative'] ?: '/';
$twig->twig_vars['admin_route'] = trim($this->admin_route, '/'); $twig->twig_vars['admin_route'] = trim($this->admin_route, '/');
$twig->twig_vars['base_url_relative'] = $twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route']; $twig->twig_vars['base_url_relative'] = $twig->twig_vars['base_url_simple'] . '/' . $twig->twig_vars['admin_route'];
$twig->twig_vars['current_url'] = rtrim($twig->twig_vars['base_url_relative'] . '/' . $this->template . '/' . $this->route, '/');
$theme_url = '/' . ltrim($this->grav['locator']->findResource('plugin://admin/themes/' . $this->theme, $theme_url = '/' . ltrim($this->grav['locator']->findResource('plugin://admin/themes/' . $this->theme,
false), '/'); false), '/');
$twig->twig_vars['theme_url'] = $theme_url; $twig->twig_vars['theme_url'] = $theme_url;