fix ghost page

sulu · Jun 14, 2017 · a2419cc · a2419cc
1 parent be571b9
commit a2419cc
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 20 deletions.
diff --git a/Resources/public/dist/components/articles/edit/adapter/article.js b/Resources/public/dist/components/articles/edit/adapter/article.js
diff --git a/Resources/public/dist/components/articles/edit/details/main.js b/Resources/public/dist/components/articles/edit/details/main.js
diff --git a/Resources/public/js/components/articles/edit/adapter/article.js b/Resources/public/js/components/articles/edit/adapter/article.js
@@ -54,7 +54,7 @@ define([
             });
 
             if (!!component.data.type && component.data.type.name === 'ghost') {
-                component.data['_hash'] = null;
+                delete component.data['_hash'];
             }
 
             return ArticleManager.save(component.data, component.data.id, component.options.locale, action);

diff --git a/Resources/public/js/components/articles/edit/details/main.js b/Resources/public/js/components/articles/edit/details/main.js
@@ -200,6 +200,9 @@ define([
 
             var data = this.options.adapter.prepareData(this.data, this);
             if (data.type && data.type.name === 'ghost') {
+                var titleProperty = this.getTitleProperty(),
+                    pageTitleProperty = this.getPageTitleProperty();
+
                 this.ghost = {
                     locale: data.type.value,
                     title: titleProperty ? data[titleProperty.name] : '',

diff --git a/Sitemap/ArticleSitemapProvider.php b/Sitemap/ArticleSitemapProvider.php
@@ -60,37 +60,56 @@ public function build($page, $portalKey)
         do {
             $bulk = $this->getBulk($repository, $from, $size);
             /** @var SitemapUrl[] $alternatives */
-            $alternatives = [];
+            $sitemapUrlListByUuid = [];
 
             /** @var ArticleViewDocumentInterface $item */
             foreach ($bulk as $item) {
                 $sitemapUrl = new SitemapUrl($item->getRoutePath(), $item->getLocale(), $item->getChanged());
+                $result[] = $sitemapUrl;
 
-                if (!isset($alternatives[$item->getUuid()])) {
-                    $alternatives[$item->getUuid()] = [];
-                } else {
-                    foreach ($alternatives as $alternative) {
-                        // Add current as alternative to exist.
-                        $alternative->addAlternateLink(
-                            new SitemapAlternateLink($item->getRoutePath(), $item->getLocale())
-                        );
-
-                        // Add others as alternative to current.
-                        $sitemapUrl->addAlternateLink(
-                            new SitemapAlternateLink($alternative->getLoc(), $alternative->getLocale())
-                        );
-                    }
+                if (!isset($sitemapUrlListByUuid[$item->getUuid()])) {
+                    $sitemapUrlListByUuid[$item->getUuid()] = [];
                 }
 
-                $alternatives[$item->getUuid()][] = $sitemapUrl;
-                $result[] = $sitemapUrl;
+                $sitemapUrlListByUuid[$item->getUuid()] = $this->setAlternatives(
+                    $sitemapUrlListByUuid[$item->getUuid()],
+                    $sitemapUrl
+                );
             }
+
             $from += $size;
         } while ($bulk->count() > $from || $from > self::PAGE_SIZE);
 
         return $result;
     }
 
+    /**
+     * Set alternatives to sitemap url.
+     *
+     * @param SitemapUrl[] $sitemapUrlList
+     * @param SitemapUrl $sitemapUrl
+     *
+     * @return $sitemapUrlList[]
+     */
+    private function setAlternatives(array $sitemapUrlList, SitemapUrl $sitemapUrl)
+    {
+        foreach ($sitemapUrlList as $sitemapUrlFromList) {
+            // Add current as alternative to exist.
+            $sitemapUrlFromList->addAlternateLink(
+                new SitemapAlternateLink($sitemapUrl->getLoc(), $sitemapUrl->getLocale())
+            );
+
+            // Add others as alternative to current.
+            $sitemapUrl->addAlternateLink(
+                new SitemapAlternateLink($alternative->getLoc(), $alternative->getLocale())
+            );
+        }
+
+        $sitemapUrlList[] = $sitemapUrl;
+
+        return $sitemapUrlList;
+    }
+
     private function getBulk(Repository $repository, $from, $size)
     {
         $search = $repository->createSearch()