diff --git a/app/Resources/views/main_template.html.twig b/app/Resources/views/main_template.html.twig index 765f39c..2b7e68f 100644 --- a/app/Resources/views/main_template.html.twig +++ b/app/Resources/views/main_template.html.twig @@ -2,6 +2,7 @@ Kék Rózsák{% block title %}{% endblock %} + {% block additional_css %}{% endblock %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Default/article.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Default/article.html.twig index 8907599..f84cb41 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Default/article.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Default/article.html.twig @@ -5,4 +5,7 @@ {% if article.source %}

Forrás: {{ article.source }}

{% endif %} +{% if app.user %} +

{{ article.createdBy.displayName }}

+{% endif %} {% endblock content %} diff --git a/src/KekRozsak/FrontBundle/Twig/NewsExtension.php b/src/KekRozsak/FrontBundle/Twig/NewsExtension.php index 1cfe3ab..3eb47d1 100644 --- a/src/KekRozsak/FrontBundle/Twig/NewsExtension.php +++ b/src/KekRozsak/FrontBundle/Twig/NewsExtension.php @@ -21,7 +21,7 @@ class NewsExtension extends \Twig_Extension { $newsRepo = $this->_doctrine->getRepository('KekRozsakFrontBundle:News'); $searchCriteria = array(); - if (!is_object($this->_securityContext->getToken()->getUser())) + if (!is_object($this->_securityContext->getToken()) || !is_object($this->_securityContext->getToken()->getUser())) $searchCriteria['public'] = true; $news = $newsRepo->findBy($searchCriteria, array('createdAt' => 'DESC'), 4);