Hox fix for es 5

Author: theus77

Controller/ContentManagement/FileController.php

@@ -5,17 +5,13 @@
 use EMS\CoreBundle\Controller\AppController;
 use EMS\CoreBundle;
 use EMS\CoreBundle\Entity\UploadedAsset;
-use EMS\CoreBundle\Repository\UploadedAssetRepository;
-use Elasticsearch\Common\Exceptions\Conflict409Exception;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
-use Symfony\Component\HttpFoundation\JsonResponse;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
-use Doctrine\ORM\EntityManager;
 use Symfony\Component\HttpFoundation\BinaryFileResponse;
+use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\ResponseHeaderBag;
+use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;
 
 class FileController extends AppController
 {

Form/DataField/DataLinkFieldType.php

@@ -97,7 +97,8 @@ public static function getIcon(){
 	 */
 	public static function buildObjectArray(DataField $data, array &$out) {
 		if (! $data->getFieldType ()->getDeleted ()) {
-			if($data->getFieldType()->getDisplayOptions()['multiple']){
+			$options = $data->getFieldType()->getDisplayOptions();
+			if(isset($options['multiple']) && $options['multiple']){
 				$out [$data->getFieldType ()->getName ()] = $data->getArrayTextValue();
 			}
 			else{

Form/Form/ContentTypeType.php

@@ -33,6 +33,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) {
 				'firstLevelOnly' => true,
 				'mapping' => $mapping,
 				'types' => [
+						'text',
 						'string',
 						'integer'
 			]]);
@@ -43,27 +44,31 @@ public function buildForm(FormBuilderInterface $builder, array $options) {
 				'mapping' => $mapping,
 				'types' => [
 						'string',
+						'text',
 			]]);
 			$builder->add ( 'circlesField', ContentTypeFieldPickerType::class, [
 				'required' => false,
 				'firstLevelOnly' => true,
 				'mapping' => $mapping,
 				'types' => [
 						'string',
+						'text',
 			]]);
 			$builder->add ( 'emailField', ContentTypeFieldPickerType::class, [
 				'required' => false,
 				'firstLevelOnly' => true,
 				'mapping' => $mapping,
 				'types' => [
 						'string',
+						'text',
 			]]);
 			$builder->add ( 'categoryField', ContentTypeFieldPickerType::class, [
 				'required' => false,
 				'firstLevelOnly' => true,
 				'mapping' => $mapping,
 				'types' => [
 						'string',
+						'text',
 			]]);
 			$builder->add ( 'imageField', ContentTypeFieldPickerType::class, [
 				'required' => false,
@@ -85,6 +90,7 @@ public function buildForm(FormBuilderInterface $builder, array $options) {
 				'mapping' => $mapping,
 				'types' => [
 						'string',
+						'text',
 						'integer',
 						'text',
 						'keyword'

Service/ContentTypeService.php

@@ -146,8 +146,11 @@ public function updateMapping(ContentType $contentType, $envs=false){
 
 		} catch ( BadRequest400Exception $e ) {
 			$contentType->setDirty ( true );
-			$message = json_decode($e->getPrevious()->getMessage(), true);
-			$this->session->getFlashBag()->add ( 'error', '<p><strong>You should try to rebuild the indexes</strong></p>
+			$message = json_decode($e->getMessage(), true);
+			if(!empty($e->getPrevious())) {
+				$message = json_decode($e->getPrevious()->getMessage(), true);				
+			}
+			$this->session->getFlashBag()->add ( 'error', '<p><strong>You should try to rebuild the indexes for '.$contentType->getName().'</strong></p>
 					<p>Message from Elasticsearch: <b>' . $message['error']['type']. '</b>'.$message['error']['reason'] . '</p>' );
 		}
 	}