From 5488d5d47c5fe199be4a405b6cb6aceeda21172a Mon Sep 17 00:00:00 2001 From: aina-esokia Date: Wed, 20 Jun 2018 17:26:19 +0400 Subject: [PATCH] FIX create subview mediatype dropdown --- lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php | 4 ++-- lib/classes/databox/subdefsStructure.php | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php index 54566df81f..4820a83c58 100644 --- a/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php +++ b/lib/Alchemy/Phrasea/Controller/Admin/SubdefsController.php @@ -208,10 +208,10 @@ class SubdefsController extends Controller protected function getSubviewsMapping() { $mapping = [ - Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE], + Type::TYPE_IMAGE => [Subdef::TYPE_IMAGE, Subdef::TYPE_PDF], Type::TYPE_VIDEO => [Subdef::TYPE_IMAGE, Subdef::TYPE_VIDEO, Subdef::TYPE_ANIMATION], Type::TYPE_AUDIO => [Subdef::TYPE_IMAGE, Subdef::TYPE_AUDIO], - Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER], + Type::TYPE_DOCUMENT => [Subdef::TYPE_IMAGE, Subdef::TYPE_FLEXPAPER, Subdef::TYPE_PDF], Type::TYPE_FLASH => [Subdef::TYPE_IMAGE] ]; diff --git a/lib/classes/databox/subdefsStructure.php b/lib/classes/databox/subdefsStructure.php index 9afd912e36..6e375a4cdc 100644 --- a/lib/classes/databox/subdefsStructure.php +++ b/lib/classes/databox/subdefsStructure.php @@ -197,7 +197,10 @@ class databox_subdefsStructure implements IteratorAggregate, Countable $subdef->setAttribute('class', $class); $subdef->setAttribute('name', mb_strtolower($name)); $subdef->setAttribute('presets', $preset); - $subdef->setAttribute('mediaType', $mediatype); + + $mediaTypeElement = $dom_struct->createElement('mediatype'); + $mediaTypeElement->appendChild($dom_struct->createTextNode($mediatype)); + $subdef->appendChild($mediaTypeElement); $dom_xp = $this->databox->get_xpath_structure(); $query = '//record/subdefs/subdefgroup[@name="' . $groupname . '"]';