Merge pull request #216 from Charlie-Lucas/master

allow date widget to display article and fix seo update

Author: Leny BERNARD

Bundle/BlogBundle/Entity/Article.php

@@ -14,7 +14,7 @@
 /**
  * @ORM\Entity(repositoryClass="Victoire\Bundle\BlogBundle\Repository\ArticleRepository"))
  * @ORM\Table("vic_article")
- * @VIC\BusinessEntity({"Force", "Redactor", "Listing", "BlogArticles", "Title", "CKEditor", "Text", "UnderlineTitle", "Cover", "Image", "Authorship", "ArticleList"})
+ * @VIC\BusinessEntity({"Date", "Force", "Redactor", "Listing", "BlogArticles", "Title", "CKEditor", "Text", "UnderlineTitle", "Cover", "Image", "Authorship", "ArticleList"})
  * @Gedmo\SoftDeleteable(fieldName="deletedAt", timeAware=false)
  */
 class Article

Bundle/SeoBundle/Helper/PageSeoHelper.php

@@ -88,9 +88,16 @@ public function updateSeoByEntity(BasePage $page, $entity)
                     foreach ($businessProperties as $businessProperty) {
                         //parse of seo attributes
                         foreach ($this->pageSeoAttributes as $seoAttribute) {
-                            $string = $this->getEntityAttributeValue($pageSeo, $seoAttribute);
-                            $updatedString = $this->parameterConverter->setBusinessPropertyInstance($string, $businessProperty, $entity);
-                            $this->setEntityAttributeValue($pageSeo, $seoAttribute, $updatedString);
+                            $value = $this->getEntityAttributeValue($pageSeo, $seoAttribute);
+                            // we only update value if its a string and (if its a VBP or its a BP where value is not defined)
+                            if (is_string($value) && ($page instanceof VirtualBusinessPage || $page instanceof BusinessPage && $value == null )) {
+                                $value = $this->parameterConverter->setBusinessPropertyInstance(
+                                    $value,
+                                    $businessProperty,
+                                    $entity
+                                );
+                            }
+                            $this->setEntityAttributeValue($pageSeo, $seoAttribute, $value);
                         }
                     }
                 }