Merge pull request #42 from YouweGit/feature/filteringAndBatchEdit

Feature/filtering and batch edit
YouweGit · Mar 16, 2020 · 15daad8 · 15daad8
2 parents acd1f5b + 192909a
commit 15daad8
Show file tree

Hide file tree

Showing 4 changed files with 334 additions and 121 deletions.
diff --git a/Model/DataObject/ClassDefinition/Data/ObjectBridge.php b/Model/DataObject/ClassDefinition/Data/ObjectBridge.php
@@ -84,16 +84,22 @@ class ObjectBridge extends ClassDefinition\Data\Relations\AbstractRelations impl
     /** @var string */
     public $bridgeVisibleFieldDefinitions;
 
-    /** @var  bool */
+    /** @var bool */
     public $autoResize;
 
-    /** @var  bool */
+    /** @var bool */
     public $newLineSplit;
 
     /** @var int */
     public $maxWidthResize;
 
-    /** @var  bool */
+    /** @var bool */
+    public $enableFiltering;
+
+    /** @var bool */
+    public $enableBatchEdit;
+
+    /** @var bool */
     public $allowCreate;
 
     /** @var bool */
@@ -1352,6 +1358,38 @@ public function setNewLineSplit($newLineSplit)
     /**
      * @return bool
      */
+    public function getEnableFiltering()
+    {
+        return $this->enableFiltering;
+    }
+
+    /**
+     * @param bool $enableFiltering
+     */
+    public function setEnableFiltering($enableFiltering)
+    {
+        $this->enableFiltering = $enableFiltering;
+    }
+
+    /**
+     * @return bool
+     */
+    public function getEnableBatchEdit()
+    {
+        return $this->enableBatchEdit;
+    }
+
+    /**
+     * @param bool $enableBatchEdit
+     */
+    public function setEnableBatchEdit($enableBatchEdit)
+    {
+        $this->enableBatchEdit = $enableBatchEdit;
+    }
+
+    /**
+     * @return boolean
+     */
     public function getAllowCreate()
     {
         return $this->allowCreate;

diff --git a/Resources/public/js/pimcore/objects/classes/data/objectBridge.js b/Resources/public/js/pimcore/objects/classes/data/objectBridge.js
@@ -256,6 +256,16 @@ pimcore.object.classes.data.objectBridge = Class.create(pimcore.object.classes.d
             fieldLabel: t("max_width_resize"),
             name: 'maxWidthResize',
             value: this.datax.maxWidthResize
+        }, {
+            xtype: "checkbox",
+            fieldLabel: t("enable_filtering"),
+            name: "enableFiltering",
+            checked: this.datax.enableFiltering
+        }, {
+            xtype: "checkbox",
+            fieldLabel: t("enable_batch_edit"),
+            name: "enableBatchEdit",
+            checked: this.datax.enableBatchEdit
         }, {
             xtype: "checkbox",
             fieldLabel: t("allow_create"),
@@ -683,6 +693,8 @@ pimcore.object.classes.data.objectBridge = Class.create(pimcore.object.classes.d
                 autoResize: source.datax.autoResize,
                 maxWidthResize: source.datax.maxWidthResize,
                 newLineSplit: source.datax.newLineSplit,
+                enableFiltering: source.datax.enableFiltering,
+                enableBatchEdit: source.datax.enableBatchEdit,
                 sourceAllowedClassName: source.datax.sourceAllowedClassName,
                 sourceVisibleFields: source.datax.sourceVisibleFields,
                 sourceHiddenFields: source.datax.sourceHiddenFields,