diff --git a/public/js/opendxp/asset/metadata/editor.js b/public/js/opendxp/asset/metadata/editor.js index 7df4ef96..e140e94a 100644 --- a/public/js/opendxp/asset/metadata/editor.js +++ b/public/js/opendxp/asset/metadata/editor.js @@ -28,9 +28,6 @@ opendxp.asset.metadata.editor = Class.create({ instance: null }; - // hook for providing a custom implementation of the asset metadata tab - // e.g. https://github.com/pimcore/asset-metadata-class-definitions - const preCreateAssetMetadataEditor = new CustomEvent(opendxp.events.preCreateAssetMetadataEditor, { detail: { editor: this, @@ -59,4 +56,4 @@ opendxp.asset.metadata.editor = Class.create({ var values = this.editorInstance.getValues(); return values; } -}); \ No newline at end of file +}); diff --git a/public/js/opendxp/document/editables/video.js b/public/js/opendxp/document/editables/video.js index bf505f9a..4d856172 100644 --- a/public/js/opendxp/document/editables/video.js +++ b/public/js/opendxp/document/editables/video.js @@ -41,7 +41,6 @@ opendxp.document.editables.video = Class.create(opendxp.document.editable, { var emptyContainer = element.query(".opendxp_editable_video_empty")[0]; if (emptyContainer) { //we have to update container id for video editable inside non-reloadable blocks - //https://github.com/pimcore/pimcore/issues/9969 emptyContainer.id = 'video_' + uniqid(); emptyContainer = Ext.get(emptyContainer); emptyContainer.on("click", this.openEditor.bind(this)); diff --git a/src/Controller/Admin/DataObject/DataObjectController.php b/src/Controller/Admin/DataObject/DataObjectController.php index 02ac82e2..2cf9acdb 100644 --- a/src/Controller/Admin/DataObject/DataObjectController.php +++ b/src/Controller/Admin/DataObject/DataObjectController.php @@ -732,7 +732,6 @@ private function getDataForField(DataObject\Concrete $object, string $key, DataO $this->getDataForField($parent, $key, $fielddefinition, $objectFromVersion, $level + 1); // exception for classification store. if there are no items then it is empty by definition. // consequence is that we have to preserve the metadata information - // see https://github.com/pimcore/pimcore/issues/9329 if ($fielddefinition instanceof DataObject\ClassDefinition\Data\Classificationstore && $level === 0) { $this->objectData[$key]['metaData'] = $value['metaData'] ?? []; $this->objectData[$key]['inherited'] = true; diff --git a/tests/Model/Permissions/ModelAssetPermissionsTest.php b/tests/Model/Permissions/ModelAssetPermissionsTest.php index daf87fba..cb53fede 100644 --- a/tests/Model/Permissions/ModelAssetPermissionsTest.php +++ b/tests/Model/Permissions/ModelAssetPermissionsTest.php @@ -73,8 +73,6 @@ protected function tearDown(): void protected function prepareObjectTree(): void { - //example based on https://github.com/pimcore/pimcore/issues/11540 - $this->permissionfoo = $this->createFolder('permissionfoo', 1); $this->permissionbar = $this->createFolder('permissionbar', 1); $this->foo = $this->createFolder('foo', $this->permissionbar->getId()); diff --git a/tests/Model/Permissions/ModelDocumentPermissionsTest.php b/tests/Model/Permissions/ModelDocumentPermissionsTest.php index 1700a4d2..c2d0f259 100644 --- a/tests/Model/Permissions/ModelDocumentPermissionsTest.php +++ b/tests/Model/Permissions/ModelDocumentPermissionsTest.php @@ -75,7 +75,6 @@ protected function tearDown(): void protected function prepareObjectTree(): void { - //example based on https://github.com/pimcore/pimcore/issues/11540 $this->permissioncpath = $this->createFolder('permissioncpath', 1); $this->permissionfoo = $this->createFolder('permissionfoo', 1);