Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 1 addition & 4 deletions public/js/opendxp/asset/metadata/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -59,4 +56,4 @@ opendxp.asset.metadata.editor = Class.create({
var values = this.editorInstance.getValues();
return values;
}
});
});
1 change: 0 additions & 1 deletion public/js/opendxp/document/editables/video.js
Original file line number Diff line number Diff line change
Expand Up @@ -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));
Expand Down
1 change: 0 additions & 1 deletion src/Controller/Admin/DataObject/DataObjectController.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 0 additions & 2 deletions tests/Model/Permissions/ModelAssetPermissionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
1 change: 0 additions & 1 deletion tests/Model/Permissions/ModelDocumentPermissionsTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down