Skip to content

Commit 15daad8

Browse files
Merge pull request #42 from YouweGit/feature/filteringAndBatchEdit
Feature/filtering and batch edit
2 parents acd1f5b + 192909a commit 15daad8

File tree

4 files changed

+334
-121
lines changed

4 files changed

+334
-121
lines changed

Model/DataObject/ClassDefinition/Data/ObjectBridge.php

Lines changed: 41 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,16 +84,22 @@ class ObjectBridge extends ClassDefinition\Data\Relations\AbstractRelations impl
8484
/** @var string */
8585
public $bridgeVisibleFieldDefinitions;
8686

87-
/** @var bool */
87+
/** @var bool */
8888
public $autoResize;
8989

90-
/** @var bool */
90+
/** @var bool */
9191
public $newLineSplit;
9292

9393
/** @var int */
9494
public $maxWidthResize;
9595

96-
/** @var bool */
96+
/** @var bool */
97+
public $enableFiltering;
98+
99+
/** @var bool */
100+
public $enableBatchEdit;
101+
102+
/** @var bool */
97103
public $allowCreate;
98104

99105
/** @var bool */
@@ -1352,6 +1358,38 @@ public function setNewLineSplit($newLineSplit)
13521358
/**
13531359
* @return bool
13541360
*/
1361+
public function getEnableFiltering()
1362+
{
1363+
return $this->enableFiltering;
1364+
}
1365+
1366+
/**
1367+
* @param bool $enableFiltering
1368+
*/
1369+
public function setEnableFiltering($enableFiltering)
1370+
{
1371+
$this->enableFiltering = $enableFiltering;
1372+
}
1373+
1374+
/**
1375+
* @return bool
1376+
*/
1377+
public function getEnableBatchEdit()
1378+
{
1379+
return $this->enableBatchEdit;
1380+
}
1381+
1382+
/**
1383+
* @param bool $enableBatchEdit
1384+
*/
1385+
public function setEnableBatchEdit($enableBatchEdit)
1386+
{
1387+
$this->enableBatchEdit = $enableBatchEdit;
1388+
}
1389+
1390+
/**
1391+
* @return boolean
1392+
*/
13551393
public function getAllowCreate()
13561394
{
13571395
return $this->allowCreate;

Resources/public/js/pimcore/objects/classes/data/objectBridge.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,16 @@ pimcore.object.classes.data.objectBridge = Class.create(pimcore.object.classes.d
256256
fieldLabel: t("max_width_resize"),
257257
name: 'maxWidthResize',
258258
value: this.datax.maxWidthResize
259+
}, {
260+
xtype: "checkbox",
261+
fieldLabel: t("enable_filtering"),
262+
name: "enableFiltering",
263+
checked: this.datax.enableFiltering
264+
}, {
265+
xtype: "checkbox",
266+
fieldLabel: t("enable_batch_edit"),
267+
name: "enableBatchEdit",
268+
checked: this.datax.enableBatchEdit
259269
}, {
260270
xtype: "checkbox",
261271
fieldLabel: t("allow_create"),
@@ -683,6 +693,8 @@ pimcore.object.classes.data.objectBridge = Class.create(pimcore.object.classes.d
683693
autoResize: source.datax.autoResize,
684694
maxWidthResize: source.datax.maxWidthResize,
685695
newLineSplit: source.datax.newLineSplit,
696+
enableFiltering: source.datax.enableFiltering,
697+
enableBatchEdit: source.datax.enableBatchEdit,
686698
sourceAllowedClassName: source.datax.sourceAllowedClassName,
687699
sourceVisibleFields: source.datax.sourceVisibleFields,
688700
sourceHiddenFields: source.datax.sourceHiddenFields,

0 commit comments

Comments
 (0)