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

Merge branch 'develop' of https://github.com/getgrav/grav-plugin-admin into 1.9

Browse Source 
# Conflicts:
#	CHANGELOG.md
#	classes/adminbasecontroller.php
#	themes/grav/js/admin.min.js
This commit is contained in:
Matias Griese
2019-01-08 11:36:20 +02:00
parent 89a0b44d0a 9cc004f188
commit d08e4bfd4f
3 changed files with 34 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
classes/adminbasecontroller.php
View File

@@ -6,6 +6,7 @@ use Grav\Common\Filesystem\Folder;
use Grav\Common\Grav;
use Grav\Common\Media\Interfaces\MediaInterface;
use Grav\Common\Page\Media;
use Grav\Common\Uri;
use Grav\Common\Utils;
use Grav\Common\Plugin;
use Grav\Common\Theme;
@@ -902,22 +903,40 @@ class AdminBaseController
*/
protected function taskRemoveFileFromBlueprint()
{
/** @var Uri $uri */
$uri = $this->grav['uri'];
$blueprint = base64_decode($uri->param('blueprint'));
$path = base64_decode($uri->param('path'));
$filename = basename(isset($this->post['filename']) ? $this->post['filename'] : $path);
$proute = base64_decode($uri->param('proute'));
$type = $uri->param('type');
$field = $uri->param('field');
// Get Blueprint
$settings = (object) $this->admin->blueprints($blueprint)->schema()->getProperty($field);
if ($type === 'pages' || strpos($blueprint, 'pages/') === 0) {
$page = $this->admin->page(true, $proute);
if (!$page) {
$this->admin->json_response = [
'status' => 'error',
'message' => 'Page not found'
];
return false;
}
$blueprints = $page->blueprints();
$path = Folder::getRelativePath($page->path());
$settings = (object)$blueprints->schema()->getProperty($field);
} else {
$page = null;
$settings = (object)$this->admin->blueprints($blueprint)->schema()->getProperty($field);
}
// Get destination
if ($this->grav['locator']->isStream($settings->destination)) {
$destination = $this->grav['locator']->findResource($settings->destination, false, true);
} else {
$destination = Folder::getRelativePath(rtrim($settings->destination, '/'));
$destination = $this->admin->getPagePathFromToken($destination);
$destination = $this->admin->getPagePathFromToken($destination, $page);
}
// Not in path
@@ -931,10 +950,9 @@ class AdminBaseController
}
// Only remove files from correct destination...
$this->taskRemoveMedia($destination . '/' . basename($path));
$this->taskRemoveMedia($destination . '/' . $filename);
if ($type === 'pages') {
$page = $this->admin->page(true, $proute);
if ($page) {
$keys = explode('.', preg_replace('/^header./', '', $field));
$header = (array)$page->header();
$data_path = implode('.', $keys);