Update translations for new context layout

[blogbundle] / Repository / ArticleRepository.php

diff --git a/Repository/ArticleRepository.php b/Repository/ArticleRepository.php
index 0d5a069bf7b014436a8dd12299e6e4b936c5ca44..9708751067d9b5005e80b699ec3366cfb5b46278 100644 (file)
--- a/Repository/ArticleRepository.php
+++ b/Repository/ArticleRepository.php
@@ -79,7 +79,7 @@ LEFT JOIN RapsysBlogBundle:ArticleKeyword AS ak ON (ak.article_id = a.id)
 LEFT JOIN RapsysBlogBundle:Keyword AS k ON (k.id = ak.keyword_id)
 LEFT JOIN RapsysBlogBundle:KeywordTranslation AS kt ON (kt.keyword_id = k.id AND kt.locale = :locale)
 GROUP BY a.id
-ORDER BY updated, created DESC
+ORDER BY updated, created DESC, a.id
 LIMIT :offset, :count
 SQL;
 
@@ -128,7 +128,7 @@ SQL;
                                'created' => $data['created'],
                                'updated' => $data['updated'],
                                'modified' => $data['modified'],
-                               'link' => $this->router->generate('rapsys_blog_article_view', ['id' => $id, 'slug' => $slug]),
+                               'link' => $this->router->generate('rapsysblog_article_view', ['id' => $id, 'slug' => $slug]),
                                'keywords' => []
                        ];
 
@@ -146,7 +146,7 @@ SQL;
                                        'id' => $id,
                                        'slug' => $slug = $data['k_slugs'][$k],
                                        'title' => $data['k_titles'][$k],
-                                       'link' => $this->router->generate('rapsys_blog_keyword_view', ['id' => $id, 'slug' => $slug]),
+                                       'link' => $this->router->generate('rapsysblog_keyword_view', ['id' => $id, 'slug' => $slug]),
                                ];
                        }
                }
@@ -166,9 +166,9 @@ SQL;
                $req = <<<SQL
 SELECT
        b.id,
-       b.created,
-       b.updated,
-       b.modified,
+       GREATEST(b.created, kat.created) AS created,
+       GREATEST(b.updated, kat.updated) AS updated,
+       GREATEST(b.created, b.updated, kat.created, kat.updated) AS modified,
        b.body,
        b.description,
        b.slug,
@@ -184,7 +184,6 @@ FROM (
                a.id,
                GREATEST(a.created, at.created, k.created, kt.created) AS created,
                GREATEST(a.updated, at.updated, k.updated, kt.updated) AS updated,
-               GREATEST(a.created, at.created, k.created, kt.created, a.updated, at.updated, k.updated, kt.updated) AS modified,
                at.body,
                at.description,
                at.slug,
@@ -247,7 +246,7 @@ SQL;
                        'created' => $data['created'],
                        'updated' => $data['updated'],
                        'modified' => $data['modified'],
-                       'link' => $this->router->generate('rapsys_blog_article_view', ['id' => $id, 'slug' => $slug]),
+                       'link' => $this->router->generate('rapsysblog_article_view', ['id' => $id, 'slug' => $slug]),
                        'alternates' => [],
                        'keywords' => []
                ];
@@ -266,7 +265,7 @@ SQL;
                                'id' => $kid,
                                'slug' => $slug = $data['k_slugs'][$k],
                                'title' => $data['k_titles'][$k],
-                               'link' => $this->router->generate('rapsys_blog_keyword_view', ['id' => $kid, 'slug' => $slug]),
+                               'link' => $this->router->generate('rapsysblog_keyword_view', ['id' => $kid, 'slug' => $slug]),
                        ];
                }
 
@@ -284,7 +283,7 @@ SQL;
                                'locale' => $locale,
                                'slug' => $slug = $data['kat_slugs'][$k],
                                'title' => $data['kat_titles'][$k],
-                               'link' => $this->router->generate('rapsys_blog_article_view', ['_locale' => $locale, 'id' => $id, 'slug' => $slug]),
+                               'link' => $this->router->generate('rapsysblog_article_view', ['_locale' => $locale, 'id' => $id, 'slug' => $slug]),
                        ];
                }