Merge pull request #83 from EmmanuelVella/switch-user-2

Update user impersonating

Resources/views/Admin/Core/user_block.html.twig

@@ -1 +1,11 @@
-{% block user_block %}{% if app.user %}{{ app.user }} - <a href="{{ url('sonata_user_admin_security_logout') }}">{{ 'user_block_logout'|trans({}, 'SonataUserBundle') }}</a> {% endif %}{% endblock %}
+{% block user_block %}
+    {% if app.user %}
+        {{ app.user }}
+
+        {% if is_granted('ROLE_PREVIOUS_ADMIN') %}
+            <a href="{{ url('sonata_user_impersonating', {'_switch_user': '_exit'}) }}">(exit)</a>
+        {% endif %}
+
+        - <a href="{{ url('sonata_user_admin_security_logout') }}">{{ 'user_block_logout'|trans({}, 'SonataUserBundle') }}</a>
+    {% endif %}
+{% endblock %}

Resources/views/Admin/Field/impersonating.html.twig

@@ -12,7 +12,9 @@ file that was distributed with this source code.
 {% extends 'SonataAdminBundle:CRUD:base_list_field.html.twig' %}
 
 {% block field %}
-    <a href="{{ url('sonata_user_impersonating', {'_switch_user': object.username}) }}" title="{{ 'switch_user'|trans({}, 'SonataUserBundle')}}">
-        <img src="{{ asset('bundles/sonataadmin/famfamfam/group_go.png') }}"  alt="{{ 'switch_user'|trans({}, 'SonataUserBundle')}}" />
-    </a>
+    {% if object.username != app.user.username %}
+        <a href="{{ url('sonata_user_impersonating', {'_switch_user': object.username}) }}" title="{{ 'switch_user'|trans({}, 'SonataUserBundle')}}">
+            <img src="{{ asset('bundles/sonataadmin/famfamfam/group_go.png') }}"  alt="{{ 'switch_user'|trans({}, 'SonataUserBundle')}}" />
+        </a>
+    {% endif %}
 {% endblock %}