hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 09:53:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove User_Adapter

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-05 17:38:27 +01:00
parent 171390f7c8
commit c156f842c7
231 changed files with 3918 additions and 2986 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/mobile/api/auth/end_user_authorization.html.twig
View File

@@ -55,7 +55,7 @@
</div>
{% else %}
{% if app['authentication'].getUser() is not none %}
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
{% set username = '<b>' ~ app['authentication'].getUser().getDisplayName() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans with {'%username%' : username} %}Hello %username%{% endtrans %}

2
templates/mobile/api/auth/native_app_access_token.html.twig
View File

@@ -38,7 +38,7 @@
</div>
{% if app['authentication'].getUser() is not none %}
{% set username = '<b>' ~ app['authentication'].getUser().get_display_name() ~ '</b>' %}
{% set username = '<b>' ~ app['authentication'].getUser().getDisplayName() ~ '</b>' %}
<div id="hello-box" class="span6 offset3">
<p class="login_hello">
{% trans with {'%username%' : username} %}Hello %username%{% endtrans %}

4
templates/mobile/lightbox/sc_note.html.twig
View File

@@ -1,5 +1,5 @@
{% for validationDatas in basket_element.getValidationDatas() %}
{% set is_mine = validationDatas.getParticipant().getUser(app).get_id() == app['authentication'].getUser().get_id() %}
{% set is_mine = validationDatas.getParticipant().getUser(app).getId() == app['authentication'].getUser().getId() %}
{% if validationDatas.getNote() != '' or (validationDatas.getAgreement() is not null and is_mine) %}
<li>
<h3 style="text-align:left;">
@@ -7,7 +7,7 @@
<img style="vertical-align:middle;"
src="/skins/lightbox/{% if validationDatas.getAgreement() == true %}agree.png{% else %}disagree.png{% endif %}" />
{% endif %}
{{ validationDatas.getParticipant().getUser(app).get_display_name() }}
{{ validationDatas.getParticipant().getUser(app).getDisplayName() }}
</h3>
{% if validationDatas.getNote() != '' %}
<p style="text-align:left;">{{ 'validation:: note' | trans }} : {{ validationDatas.getNote()|nl2br }}</p>