Mirrors/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-02-20 19:56:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fixed media field saving issues in Flex Pages

Browse Source
This commit is contained in:
Matias Griese 2020-06-04 22:01:23 +03:00
parent e063718e4f
commit b2230225cc
3 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
UPGRADE-1.7.md
View File

@ -188,6 +188,7 @@
### Flex
* Do not use `Framework` Flex classes directly, it's better to use or extend classes under `Grav\Common\Flex\Types\Generic` namespace
* Added `$grav['flex']` to access all registered Flex Directories
* Added `FlexRegisterEvent` which triggers when `$grav['flex']` is being accessed the first time
* Added `hasFlexFeature()` method to test if `FlexObject` or `FlexCollection` implements a given feature

6
system/src/Grav/Common/Flex/Types/Users/UserObject.php
View File

@ -19,17 +19,14 @@ use Grav\Common\Grav;
use Grav\Common\Media\Interfaces\MediaCollectionInterface;
use Grav\Common\Media\Interfaces\MediaUploadInterface;
use Grav\Common\Page\Media;
use Grav\Common\Page\Medium\ImageMedium;
use Grav\Common\Page\Medium\Medium;
use Grav\Common\Page\Medium\MediumFactory;
use Grav\Common\Page\Medium\StaticImageMedium;
use Grav\Common\User\Access;
use Grav\Common\User\Authentication;
use Grav\Common\Flex\Types\UserGroups\UserGroupCollection;
use Grav\Common\Flex\Types\UserGroups\UserGroupIndex;
use Grav\Common\User\Interfaces\UserInterface;
use Grav\Common\User\Traits\UserTrait;
use Grav\Common\Utils;
use Grav\Framework\File\Formatter\JsonFormatter;
use Grav\Framework\File\Formatter\YamlFormatter;
use Grav\Framework\Flex\Flex;
@ -38,7 +35,6 @@ use Grav\Framework\Flex\FlexObject;
use Grav\Framework\Flex\Storage\FileStorage;
use Grav\Framework\Flex\Traits\FlexMediaTrait;
use Grav\Framework\Form\FormFlashFile;
use Grav\Framework\Media\Interfaces\MediaManipulationInterface;
use Psr\Http\Message\UploadedFileInterface;
use RocketTheme\Toolbox\File\FileInterface;
use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
@ -62,7 +58,7 @@ use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator;
* @property bool $authenticated
* @property bool $authorized
*/
class UserObject extends FlexObject implements UserInterface, MediaManipulationInterface, \Countable
class UserObject extends FlexObject implements UserInterface, \Countable
{
use FlexGravTrait;
use FlexObjectTrait;

8
system/src/Grav/Framework/Flex/Pages/FlexPageObject.php
View File

@ -17,7 +17,6 @@ use Grav\Common\Page\Traits\PageFormTrait;
use Grav\Common\User\Interfaces\UserCollectionInterface;
use Grav\Framework\File\Formatter\YamlFormatter;
use Grav\Framework\Flex\FlexObject;
use Grav\Framework\Flex\Interfaces\FlexCollectionInterface;
use Grav\Framework\Flex\Interfaces\FlexObjectInterface;
use Grav\Framework\Flex\Interfaces\FlexTranslateInterface;
use Grav\Framework\Flex\Pages\Traits\PageAuthorsTrait;
@ -26,13 +25,12 @@ use Grav\Framework\Flex\Pages\Traits\PageLegacyTrait;
use Grav\Framework\Flex\Pages\Traits\PageRoutableTrait;
use Grav\Framework\Flex\Pages\Traits\PageTranslateTrait;
use Grav\Framework\Flex\Traits\FlexMediaTrait;
use Grav\Framework\Media\Interfaces\MediaManipulationInterface;
/**
* Class FlexPageObject
* @package Grav\Plugin\FlexObjects\Types\FlexPages
*/
class FlexPageObject extends FlexObject implements PageInterface, MediaManipulationInterface, FlexTranslateInterface
class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateInterface
{
use PageAuthorsTrait;
use PageContentTrait;
@ -352,7 +350,7 @@ class FlexPageObject extends FlexObject implements PageInterface, MediaManipulat
public function setNestedProperty($property, $value, $separator = null)
{
if (strpos($property, 'header.') === 0) {
$this->getProperty('header')->set(str_replace('header.', '', $property), $value);
$this->getProperty('header')->set(str_replace('header.', '', $property), $value, $separator);
return $this;
}
@ -370,7 +368,7 @@ class FlexPageObject extends FlexObject implements PageInterface, MediaManipulat
public function unsetNestedProperty($property, $separator = null)
{
if (strpos($property, 'header.') === 0) {
$this->getProperty('header')->undef(str_replace('header.', '', $property));
$this->getProperty('header')->undef(str_replace('header.', '', $property), $separator);
return $this;
}