mirror of
https://github.com/getgrav/grav-plugin-admin.git
synced 2026-05-06 18:36:36 +02:00
Fix redirect in deleting media from file field. Better format for file field code
This commit is contained in:
@@ -1478,6 +1478,12 @@ class AdminController
|
||||
}
|
||||
|
||||
$redirect = base64_decode($uri->param('redirect'));
|
||||
$route = $this->grav['config']->get('plugins.admin.route');
|
||||
|
||||
if (substr($redirect, 0, strlen($route)) == $route) {
|
||||
$redirect = substr($redirect, strlen($route) + 1);
|
||||
}
|
||||
|
||||
$this->post = array('_redirect' => $redirect);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -10,7 +10,12 @@
|
||||
{% else %}
|
||||
{% if value %}
|
||||
<img src="{{ uri.rootUrl == '/' ? '/' : uri.rootUrl ~ '/'}}{{ value }}" alt="{{ value|replace({(files.destination ~ '/'): ''}) }}" />
|
||||
<a href="{{ uri.addNonce(base_url_relative ~ '/media/' ~ base64_encode(base_path ~ '/' ~ value) ~ '/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~ '/blueprint' ~ config.system.param_sep ~ files.blueprint ~ '/field' ~ config.system.param_sep ~ files.name ~ '/redirect' ~ config.system.param_sep ~ base64_encode(uri.path), 'admin-form', 'admin-nonce') }}">
|
||||
<a href="{{ uri.addNonce(base_url_relative ~
|
||||
'/media/' ~ base64_encode(base_path ~ '/' ~ value) ~
|
||||
'/task' ~ config.system.param_sep ~ 'removeFileFromBlueprint' ~
|
||||
'/blueprint' ~ config.system.param_sep ~ files.blueprint ~
|
||||
'/field' ~ config.system.param_sep ~ files.name ~
|
||||
'/redirect' ~ config.system.param_sep ~ base64_encode(uri.path), 'admin-form', 'admin-nonce') }}">
|
||||
<i class="fa fa-close"></i>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user