diff --git a/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig b/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig index b11939c..0476779 100644 --- a/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig +++ b/src/KekRozsak/AdminBundle/Resources/views/Default/groupJoinRequests.html.twig @@ -21,7 +21,7 @@ {% for request in group.members %} {% if not group.isMember(request.user) %} - {{ request.user.displayName }} + {{ request.user|userdataspan }}
diff --git a/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig b/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig index 61613da..90951e7 100644 --- a/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig +++ b/src/KekRozsak/AdminBundle/Resources/views/Default/manageRegs.html.twig @@ -19,7 +19,7 @@ {{ user.username }} {{ user.email }} - {{ user.displayName }} + {{ user|userdataspan }} {{ user.registeredAt|date('Y-m-d H:i') }} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig index 81331b4..d59da78 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Article/view.html.twig @@ -8,6 +8,6 @@

Forrás: {{ article.source }}

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

{{ article.createdBy.displayName }}

+

{{ article.createdBy|userdataspan }}

{% endif %} {% endblock content %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig index 5f23c92..1d3a600 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Document/view.html.twig @@ -7,5 +7,5 @@ {{ document.title }}{% if document.createdBy == app.user %} [ Szerkesztés ] {% endif %} {{ document.content|raw }} -
{{ document.createdBy.displayName }}
+
{{ document.createdBy|userdataspan }}
{% endblock content %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig index 18e8992..268962c 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Event/view.html.twig @@ -5,14 +5,14 @@ {% block content %}

Esemény - {{ event.title }}

{{ event.startDate|date('Y-m-d') }} {{ event.startTime|date('H:i') }}{% if event.endDate or event.endTime %} - {% endif %}{% if event.endDate is not null %} {{ event.endDate|date('Y-m-d') }}{% endif %}{% if event.endTime is not null %} {{ event.endTime|date('H:i') }}{% endif %}

-

Az eseményt szervezi: {{ event.createdBy.displayName }}

+

Az eseményt szervezi: {{ event.createdBy|userdataspan }}

{{ event.description }}

Eddigi résztvevők

{% if not event.isAttending(app.user) %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig index d431e4b..e9d0073 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/postList.html.twig @@ -33,7 +33,7 @@ {{ post.createdAt|date('Y-m-d') }}
{{ post.createdAt|date('H:i') }}
[avatar]
- {{ post.createdBy.displayName }}
+ {{ post.createdBy|userdataspan }}
Szint

Tagság kezdete:
diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig index 3221ac7..dc0ec2f 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicGroupList.html.twig @@ -22,7 +22,7 @@ {% if topic.lastPost %} - {{ topic.lastPost.createdBy.displayName }}
+ {{ topic.lastPost.createdBy|userdataspan }}
{{ topic.lastPost.createdAt|date('Y-m-d H:i') }} {% else %}  
  diff --git a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig index b9ffe09..96c4b33 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Forum/topicList.html.twig @@ -20,7 +20,7 @@ {% if topic.lastPost %} - {{ topic.lastPost.createdBy.displayName }}
+ {{ topic.lastPost.createdBy|userdataspan }}
{{ topic.lastPost.createdAt|date('Y-m-d H:i') }} {% else %}  
  diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig index 4f15e1d..0d467c5 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/documents.html.twig @@ -23,7 +23,7 @@ [ikon] {{ document.title }} - {{ document.createdBy.displayName }}
+ {{ document.createdBy|userdataspan }}
{{ document.createdAt|date('Y-m-d H:i') }} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig index e320f81..c73618a 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/join.html.twig @@ -5,9 +5,9 @@ {% block content %}

Jelentkezés

{% if isRequested %} -Már jelentkeztél ebbe a csoportba ({{ group.name }}), de {{ group.leader.displayName }} még nem hagyta jóvá a belépésedet. +Már jelentkeztél ebbe a csoportba ({{ group.name }}), de {{ group.leader|userdataspan }} még nem hagyta jóvá a belépésedet. {% endif %} {% if needApproval %} -A csoportba való jelentkezésedről a csoport vezetőjét ({{ group.leader.displayName }}) értesítettük. +A csoportba való jelentkezésedről a csoport vezetőjét ({{ group.leader|userdataspan }}) értesítettük. {% endif %} {% endblock content %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig index 2d02b5f..324f7ff 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/list.html.twig @@ -34,7 +34,7 @@ {% endif %} {% endif %} - {% if group.leader %}{{ group.leader.displayName }}{% else %}Nincs{% endif %} + {% if group.leader %}{{ group.leader|userdataspan }}{% else %}Nincs{% endif %} {% endfor %} diff --git a/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig b/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig index 151b0d9..308e476 100644 --- a/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig +++ b/src/KekRozsak/FrontBundle/Resources/views/Group/members.html.twig @@ -14,7 +14,7 @@ diff --git a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php index 049121a..d8dced1 100644 --- a/src/KekRozsak/SecurityBundle/Controller/DefaultController.php +++ b/src/KekRozsak/SecurityBundle/Controller/DefaultController.php @@ -4,7 +4,9 @@ namespace KekRozsak\SecurityBundle\Controller; use Symfony\Bundle\FrameworkBundle\Controller\Controller; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\Method; use Sensio\Bundle\FrameworkExtraBundle\Configuration\Template; +use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter; use Symfony\Component\Security\Core\SecurityContext; use Symfony\Component\Security\Core\User\UserInterface; @@ -121,4 +123,17 @@ class DefaultController extends Controller return array( ); } + + /** + * @Route("/profil/{id}/ajax-felhasznalo-info.{_format}", name="KekRozsakSecurityBundle_ajaxUserdata", requirements={"_format": "html"}) + * @Method({"GET"}) + * @Template() + * @ParamConverter("user") + */ + public function ajaxUserdataAction(User $user) + { + return array( + 'user' => $user, + ); + } } diff --git a/src/KekRozsak/SecurityBundle/Resources/config/services.xml b/src/KekRozsak/SecurityBundle/Resources/config/services.xml index 286e69c..0501c88 100644 --- a/src/KekRozsak/SecurityBundle/Resources/config/services.xml +++ b/src/KekRozsak/SecurityBundle/Resources/config/services.xml @@ -8,5 +8,10 @@ + + + + + diff --git a/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig b/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig new file mode 100644 index 0000000..4b96787 --- /dev/null +++ b/src/KekRozsak/SecurityBundle/Resources/views/Default/ajaxUserdata.html.twig @@ -0,0 +1,10 @@ +{# vim: ft=htmljinja +#} + + + {{ user.displayName }} + + + Tagság kezdete: {{ user.registeredAt|date('Y-m-d') }} + + diff --git a/src/KekRozsak/SecurityBundle/Twig/UserDataSpanExtension.php b/src/KekRozsak/SecurityBundle/Twig/UserDataSpanExtension.php new file mode 100644 index 0000000..632912f --- /dev/null +++ b/src/KekRozsak/SecurityBundle/Twig/UserDataSpanExtension.php @@ -0,0 +1,41 @@ +_serviceContainer = $container; + $this->_securityContext = $security; + } + + public function getFilters() + { + return array( + 'userdataspan' => new \Twig_Filter_Method($this, 'getUserDataSpan', array('is_safe' => array('html'))), + ); + } + + public function getUserDataSpan(User $user) + { + if (!is_object($this->_securityContext->getToken()) || !is_object($this->_securityContext->getToken()->getUser())) + return '[nem jelenhet meg]'; + + return '' . $user->getDisplayName() . ''; + } + + public function getName() + { + return 'twig_userdataspan'; + } +} +