Merge branch '4.0' into 5.0

instride-ch · Jul 17, 2024 · 0b6dfe1 · 0b6dfe1
2 parents 180e3e7 + c841fde
commit 0b6dfe1
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 5 deletions.
diff --git a/src/DataDefinitionsBundle/DependencyInjection/Configuration.php b/src/DataDefinitionsBundle/DependencyInjection/Configuration.php
@@ -67,6 +67,7 @@ public function getConfigTreeBuilder(): TreeBuilder
                             ->scalarNode('cleaner')->end()
                             ->scalarNode('key')->end()
                             ->scalarNode('filter')->end()
+                            ->scalarNode('persister')->end()
                             ->booleanNode('renameExistingObjects')->end()
                             ->booleanNode('relocateExistingObjects')->end()
                             ->booleanNode('skipNewObjects')->end()

diff --git a/src/DataDefinitionsBundle/Exporter/Exporter.php b/src/DataDefinitionsBundle/Exporter/Exporter.php
@@ -21,6 +21,7 @@
 use Exception;
 use InvalidArgumentException;
 use Pimcore;
+use Pimcore\Model\DataObject;
 use Pimcore\Model\DataObject\Concrete;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
@@ -116,6 +117,9 @@ private function runExport(
         FetcherInterface $fetcher,
         ExportProviderInterface $provider
     ) {
+        $getInheritedValues = DataObject::getGetInheritedValues();
+        DataObject::setGetInheritedValues($definition->isEnableInheritance());
+
         UnpublishedHelper::hideUnpublished(
             function () use ($definition, $params, $total, $fetcher, $provider, $fetcherContext) {
                 $count = 0;
@@ -180,6 +184,8 @@ function () use ($definition, $params, $total, $fetcher, $provider, $fetcherCont
             },
             false === $definition->isFetchUnpublished()
         );
+
+        DataObject::setGetInheritedValues($getInheritedValues);
     }
 
     private function exportRow(

diff --git a/src/DataDefinitionsBundle/Form/Type/ExportDefinitionType.php b/src/DataDefinitionsBundle/Form/Type/ExportDefinitionType.php
@@ -52,6 +52,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
             ->add('runner', ExportRunnerChoiceType::class)
             ->add('name', TextType::class)
             ->add('stopOnException', CheckboxType::class)
+            ->add('enableInheritance', CheckboxType::class)
             ->add('fetchUnpublished', CheckboxType::class)
             ->add('failureNotificationDocument', IntegerType::class)
             ->add('successNotificationDocument', IntegerType::class)

diff --git a/src/DataDefinitionsBundle/Model/ExportDefinition.php b/src/DataDefinitionsBundle/Model/ExportDefinition.php
@@ -21,6 +21,11 @@
  */
 class ExportDefinition extends AbstractDataDefinition implements ExportDefinitionInterface
 {
+    /**
+     * @var bool
+     */
+    public $enableInheritance = true;
+
     /**
      * @var string
      */
@@ -54,6 +59,22 @@ public static function getByName($id)
         return $definitionEntry;
     }
 
+    /**
+     * @param bool $enableInheritance
+     */
+    public function setEnableInheritance(bool $enableInheritance): void
+    {
+        $this->enableInheritance = $enableInheritance;
+    }
+
+    /**
+     * @return bool
+     */
+    public function isEnableInheritance(): bool
+    {
+        return $this->enableInheritance;
+    }
+
     public function getFetcher()
     {
         return $this->fetcher;

diff --git a/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ExportDefinition/Dao.php
@@ -121,6 +121,7 @@ public function save()
             'mapping',
             'runner',
             'stopOnException',
+            'enableInheritance',
             'fetchUnpublished',
             'failureNotificationDocument',
             'successNotificationDocument',

diff --git a/src/DataDefinitionsBundle/Model/ExportDefinitionInterface.php b/src/DataDefinitionsBundle/Model/ExportDefinitionInterface.php
@@ -18,6 +18,16 @@
 
 interface ExportDefinitionInterface extends DataDefinitionInterface
 {
+    /**
+     * @param bool $enableInheritance
+     */
+    public function setEnableInheritance(bool $enableInheritance): void;
+
+    /**
+     * @return bool
+     */
+    public function isEnableInheritance(): bool;
+
     /**
      * @return mixed
      */

diff --git a/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php b/src/DataDefinitionsBundle/Model/ImportDefinition/Dao.php
@@ -134,6 +134,7 @@ public function save()
             'forceLoadObject',
             'loader',
             'fetcher',
+            'persister',
         ];
 
         foreach ($dataRaw as $key => $value) {

diff --git a/src/DataDefinitionsBundle/Resources/config/serializer/Model.ExportDefinition.yml b/src/DataDefinitionsBundle/Resources/config/serializer/Model.ExportDefinition.yml
@@ -2,6 +2,10 @@ Instride\Bundle\DataDefinitionsBundle\Model\ExportDefinition:
   exclusion_policy: ALL
   xml_root_name: export_definition
   properties:
+    enableInheritance:
+      expose: true
+      type: boolean
+      groups: [Detailed]
     fetcher:
       expose: true
       type: string

diff --git a/src/DataDefinitionsBundle/Resources/config/serializer/Model.ImportDefinition.yml b/src/DataDefinitionsBundle/Resources/config/serializer/Model.ImportDefinition.yml
@@ -50,6 +50,10 @@ Instride\Bundle\DataDefinitionsBundle\Model\ImportDefinition:
       expose: true
       type: boolean
       groups: [ Detailed ]
+    persister:
+      expose: true
+      type: string
+      groups: [ Detailed ]
   virtual_properties:
     isWriteable:
       exp: object.isWriteable()

diff --git a/src/DataDefinitionsBundle/Resources/public/pimcore/js/export/item.js b/src/DataDefinitionsBundle/Resources/public/pimcore/js/export/item.js
@@ -124,6 +124,12 @@ pimcore.plugin.datadefinitions.export.item = Class.create(pimcore.plugin.datadef
                     name: 'stopOnException',
                     checked: this.data.stopOnException
                 },
+                {
+                    fieldLabel: t('data_definitions_enable_inheritance'),
+                    xtype: 'checkbox',
+                    name: 'enableInheritance',
+                    checked: this.data.enableInheritance
+                },
                 {
                     fieldLabel: t('data_definitions_fetcher_objects_unpublished'),
                     xtype: 'checkbox',

diff --git a/src/DataDefinitionsBundle/Resources/translations/admin.en.yml b/src/DataDefinitionsBundle/Resources/translations/admin.en.yml
@@ -44,6 +44,7 @@ data_definitions_filter: 'Filter'
 data_definitions_runner: 'Runner'
 data_definitions_create_version: 'Create new Version on every Run'
 data_definitions_stop_on_exception: 'Stop on Exception'
+data_definitions_enable_inheritance: 'Enable Inheritance'
 data_definitions_installed: 'ImportDefinitions has been installed'
 data_definitions_uninstalled: 'ImportDefinitions has been uninstalled'
 data_definitions_success_document: 'Success Notification Document'

diff --git a/src/DataDefinitionsBundle/Service/FieldSelection.php b/src/DataDefinitionsBundle/Service/FieldSelection.php
@@ -27,11 +27,12 @@ public function getClassDefinition(DataObject\ClassDefinition $class): array
         $fields = $class->getFieldDefinitions();
 
         $systemColumns = [
-            'o_published',
-            'o_key',
-            'o_parentId',
-            'o_parent',
-            'o_type',
+            'id',
+            'published',
+            'key',
+            'parentId',
+            'parent',
+            'type',
         ];
 
         $result = [];