Skip to content

(Bugfix) Creation of dynamic property is deprecated #943

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed

(Bugfix) Creation of dynamic property is deprecated #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b76a6b5
(Bugfix) Creation of dynamic property is deprecated
May 28, 2025
e174d55
(BUG) Fix issue showing the path on workspace tab for role edition
Jun 12, 2025
c92754c
Merge branch 'pimcore:1.7' into 1.7
cgonzalezbermudez Jun 12, 2025
10488ab
Merge branch 'pimcore:1.7' into 1.7
cgonzalezbermudez Jul 9, 2025
c8bd372
(BUG) Fix issue showing the path on workspace tab for role edition
Jul 11, 2025
6e94da5
(BUG) Fix issue showing the path on workspace tab for role edition
Jul 16, 2025
a3122ef
Fix missing flag icon for Norwegian(no) language
Jul 18, 2025
2d3656b
Merge branch 'pimcore:1.7' into 1.7
cgonzalezbermudez Jul 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions public/js/pimcore/settings/user/workspace/asset.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ pimcore.settings.user.workspace.asset = Class.create({

var availableRights = ["list","view","publish","delete","rename","create","settings","versions","properties"];
var gridPlugins = [];
var storeFields = ["path"];
var storeFields = ["cpath"];

var typesColumns = [
{text: t("path"), width: 200, sortable: false, dataIndex: 'path',
{text: t("path"), width: 200, sortable: false, dataIndex: 'cpath',
editor: new Ext.form.TextField({}),
renderer: Ext.util.Format.htmlEncode,
tdCls: "pimcore_property_droptarget"
Expand Down Expand Up @@ -99,7 +99,7 @@ pimcore.settings.user.workspace.asset = Class.create({
trackMouseOver: true,
columnLines: true,
stripeRows: true,
autoExpandColumn: "path",
autoExpandColumn: "cpath",
autoHeight: true,
style: "margin-bottom:20px;",
plugins: [
Expand Down Expand Up @@ -159,7 +159,7 @@ pimcore.settings.user.workspace.asset = Class.create({
var data = record.data;

// check for duplicate records
var index = this.grid.getStore().findExact("path", data.path);
var index = this.grid.getStore().findExact("cpath", data.path);
if (index >= 0) {
return false;
}
Expand All @@ -169,7 +169,7 @@ pimcore.settings.user.workspace.asset = Class.create({
}

var rec = this.grid.getStore().getAt(myRowIndex);
rec.set("path", data.path);
rec.set("cpath", data.path);

this.updateRows();

Expand All @@ -186,7 +186,7 @@ pimcore.settings.user.workspace.asset = Class.create({

onAdd: function (btn, ev) {
this.grid.store.insert(0, {
path: ""
cpath: ""
});

this.updateRows();
Expand Down
12 changes: 6 additions & 6 deletions public/js/pimcore/settings/user/workspace/document.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ pimcore.settings.user.workspace.document = Class.create({
var availableRights = ["list","view","save","publish","unpublish","delete","rename","create","settings",
"versions","properties"];
var gridPlugins = [];
var storeFields = ["path"];
var storeFields = ["cpath"];

var typesColumns = [
{text: t("path"), width: 200, sortable: false, dataIndex: 'path',
{text: t("path"), width: 200, sortable: false, dataIndex: 'cpath',
editor: new Ext.form.TextField({}),
renderer: Ext.util.Format.htmlEncode,
tdCls: "pimcore_property_droptarget"
Expand Down Expand Up @@ -100,7 +100,7 @@ pimcore.settings.user.workspace.document = Class.create({
trackMouseOver: true,
columnLines: true,
stripeRows: true,
autoExpandColumn: "path",
autoExpandColumn: "cpath",
autoHeight: true,
style: "margin-bottom:20px;",
plugins: [
Expand Down Expand Up @@ -160,7 +160,7 @@ pimcore.settings.user.workspace.document = Class.create({
var data = record.data;

// check for duplicate records
var index = this.grid.getStore().findExact("path", data.path);
var index = this.grid.getStore().findExact("cpath", data.path);
if (index >= 0) {
return false;
}
Expand All @@ -170,7 +170,7 @@ pimcore.settings.user.workspace.document = Class.create({
}

var rec = this.grid.getStore().getAt(myRowIndex);
rec.set("path", data.path);
rec.set("cpath", data.path);

this.updateRows();

Expand All @@ -187,7 +187,7 @@ pimcore.settings.user.workspace.document = Class.create({

onAdd: function (btn, ev) {
this.grid.store.insert(0, {
path: ""
cpath: ""
});

this.updateRows();
Expand Down
16 changes: 8 additions & 8 deletions public/js/pimcore/settings/user/workspace/object.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ pimcore.settings.user.workspace.object = Class.create({
"versions","properties"];

var gridPlugins = [];
var storeFields = ["path"];
var storeFields = ["cpath"];

var typesColumns = [
{text: t("path"), width: 200, sortable: false, dataIndex: 'path',
{text: t("path"), width: 200, sortable: false, dataIndex: 'cpath',
editor: new Ext.form.TextField({}),
renderer: Ext.util.Format.htmlEncode,
tdCls: "pimcore_property_droptarget"
Expand Down Expand Up @@ -81,10 +81,10 @@ pimcore.settings.user.workspace.object = Class.create({
lView: data.data.lView,
lEdit: data.data.lEdit,
layouts: data.data.layouts,
path: data.data.path
cpath: data.data.cpath
};

var dialog = new pimcore.settings.user.workspace.special(callback, specialData, data.data.path);
var dialog = new pimcore.settings.user.workspace.special(callback, specialData, data.data.cpath);
dialog.show();
}.bind(this)
}]
Expand Down Expand Up @@ -132,7 +132,7 @@ pimcore.settings.user.workspace.object = Class.create({
trackMouseOver: true,
columnLines: true,
stripeRows: true,
autoExpandColumn: "path",
autoExpandColumn: "cpath",
autoHeight: true,
style: "margin-bottom:20px;",
plugins: [
Expand Down Expand Up @@ -192,7 +192,7 @@ pimcore.settings.user.workspace.object = Class.create({
var data = record.data;

// check for duplicate records
var index = this.grid.getStore().findExact("path", data.path);
var index = this.grid.getStore().findExact("cpath", data.path);
if (index >= 0) {
return false;
}
Expand All @@ -202,7 +202,7 @@ pimcore.settings.user.workspace.object = Class.create({
}

var rec = this.grid.getStore().getAt(myRowIndex);
rec.set("path", data.path);
rec.set("cpath", data.path);

this.updateRows();

Expand All @@ -219,7 +219,7 @@ pimcore.settings.user.workspace.object = Class.create({

onAdd: function (btn, ev) {
this.grid.store.insert(0, {
path: ""
cpath: ""
});

this.updateRows();
Expand Down
22 changes: 14 additions & 8 deletions src/Controller/Admin/UserController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,11 +325,11 @@ public function updateAction(Request $request, TranslatorInterface $translator):
foreach ($workspaces as $type => $spaces) {
$newWorkspaces = [];
foreach ($spaces as $space) {
if (in_array($space['path'], $processedPaths[$type])) {
throw new \Exception('Error saving workspaces as multiple entries found for path "' . $space['path'] .'" in '.$translator->trans((string)$type, [], 'admin') . 's');
if (in_array($space['cpath'], $processedPaths[$type])) {
throw new \Exception('Error saving workspaces as multiple entries found for path "' . $space['cpath'] .'" in '.$translator->trans((string)$type, [], 'admin') . 's');
}

$element = Element\Service::getElementByPath($type, $space['path']);
$element = Element\Service::getElementByPath($type, $space['cpath']);
if ($element) {
$className = '\\Pimcore\\Model\\User\\Workspace\\' . Element\Service::getBaseClassNameForElement($type);
$workspace = new $className();
Expand All @@ -340,7 +340,7 @@ public function updateAction(Request $request, TranslatorInterface $translator):
$workspace->setUserId($user->getId());

$newWorkspaces[] = $workspace;
$processedPaths[$type][] = $space['path'];
$processedPaths[$type][] = $space['cpath'];
}
}
$user->{'setWorkspaces' . ucfirst($type)}($newWorkspaces);
Expand Down Expand Up @@ -394,8 +394,11 @@ public function getAction(Request $request): JsonResponse
foreach ($workspaces as $wKey => $workspace) {
$el = Element\Service::getElementById($type, $workspace->getCid());
if ($el) {
// direct injection => not nice but in this case ok ;-)
$workspace->path = $el->getRealFullPath();
if ($el instanceof User\Workspace\Asset || $el instanceof User\Workspace\DataObject || $el instanceof User\Workspace\Document) {
if (method_exists($el, 'setCpath')) {
$workspace->setCpath($el->getRealFullPath());
}
}
$workspaces[$wKey] = $workspace->getObjectVars();
}
}
Expand Down Expand Up @@ -709,8 +712,11 @@ public function roleGetAction(Request $request): JsonResponse
foreach ($workspaces as $wKey => $workspace) {
$el = Element\Service::getElementById($type, $workspace->getCid());
if ($el) {
// direct injection => not nice but in this case ok ;-)
$workspace->path = $el->getRealFullPath();
if ($el instanceof User\Workspace\Asset || $el instanceof User\Workspace\DataObject || $el instanceof User\Workspace\Document) {
if (method_exists($el, 'setCpath')) {
$workspace->setCpath($el->getRealFullPath());
}
}
$workspaces[$wKey] = $workspace->getObjectVars();
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Tool.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ public static function getLanguageFlagFile(string $language, bool $absolutePath
'hu' => 'hu', 'hy' => 'am', 'id' => 'id', 'ig' => 'ng', 'is' => 'is', 'it' => 'it', 'ja' => 'jp',
'ka' => 'ge', 'os' => 'ge', 'kea' => 'cv', 'kk' => 'kz', 'kl' => 'gl', 'km' => 'kh', 'ko' => 'kr',
'lg' => 'ug', 'lo' => 'la', 'lt' => 'lt', 'mg' => 'mg', 'mk' => 'mk', 'mn' => 'mn', 'ms' => 'my',
'mt' => 'mt', 'my' => 'mm', 'nb' => 'no', 'ne' => 'np', 'nl' => 'nl', 'nn' => 'no', 'pl' => 'pl',
'mt' => 'mt', 'my' => 'mm', 'nb' => 'no', 'ne' => 'np', 'nl' => 'nl', 'no' => 'no', 'nn' => 'no', 'pl' => 'pl',
'pt' => 'pt', 'ro' => 'ro', 'ru' => 'ru', 'sg' => 'cf', 'sk' => 'sk', 'sl' => 'si', 'sq' => 'al',
'sr' => 'rs', 'sv' => 'se', 'swc' => 'cd', 'th' => 'th', 'to' => 'to', 'tr' => 'tr', 'tzm' => 'ma',
'uk' => 'ua', 'uz' => 'uz', 'vi' => 'vn', 'zh' => 'cn', 'gd' => 'gb-sct', 'gd-gb' => 'gb-sct',
Expand Down
Loading