hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +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>

30
templates/web/account/account.html.twig
View File

@@ -38,7 +38,7 @@
<div class="control-group">
<label class="form_label control-label" for="form_login"><strong>{{ "admin::compte-utilisateur identifiant" | trans }}</strong></label>
<div class="controls">
<span class="control-span">{{ app["authentication"].getUser().get_login() }}</span>
<span class="control-span">{{ app["authentication"].getUser().getLogin() }}</span>
<p class="form_alert help-block"></p>
</div>
</div>
@@ -47,13 +47,13 @@
<div class="controls">
<select name="form_gender" class="input-xlarge">
<option value=""></option>
<option {% if app["authentication"].getUser().get_gender() == "0" %}selected{% endif %} value="0" >
<option {% if app["authentication"].getUser().getGender() == "0" %}selected{% endif %} value="0" >
{{ "admin::compte-utilisateur:sexe: mademoiselle" | trans }}
</option>
<option {% if app["authentication"].getUser().get_gender() == "1" %}selected{% endif %} value="1" >
<option {% if app["authentication"].getUser().getGender() == "1" %}selected{% endif %} value="1" >
{{ "admin::compte-utilisateur:sexe: madame" | trans }}
</option>
<option {% if app["authentication"].getUser().get_gender() == "2" %}selected{% endif %} value="2" >
<option {% if app["authentication"].getUser().getGender() == "2" %}selected{% endif %} value="2" >
{{ "admin::compte-utilisateur:sexe: monsieur" | trans }}
</option>
</select>
@@ -63,21 +63,21 @@
<div class="control-group">
<label class="form_label control-label" for="form_lastname"><strong>{{ "admin::compte-utilisateur nom" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_lastname" id="form_lastname" value="{{ app["authentication"].getUser().get_lastname() }}" />
<input class="input_element input-xlarge" type="text" name="form_lastname" id="form_lastname" value="{{ app["authentication"].getUser().getLastName() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_firstname"><strong>{{ "admin::compte-utilisateur prenom" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_firstname" id="form_firstname" value="{{ app["authentication"].getUser().get_firstname() }}" />
<input class="input_element input-xlarge" type="text" name="form_firstname" id="form_firstname" value="{{ app["authentication"].getUser().getFirstName() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_firstname"><strong>{{ "admin::compte-utilisateur email" | trans }}</strong></label>
<div class="controls">
<span class="control-span">{{ app["authentication"].getUser().get_email() }} <a href="{{ path("account_reset_email") }}" target="_self">{{ "login:: Changer mon adresse email" | trans }}</a></span>
<span class="control-span">{{ app["authentication"].getUser().getEmail() }} <a href="{{ path("account_reset_email") }}" target="_self">{{ "login:: Changer mon adresse email" | trans }}</a></span>
<p class="form_alert help-block"></p>
</div>
</div>
@@ -90,56 +90,56 @@
<div class="control-group">
<label class="form_label control-label" for="form_address"><strong>{{ "admin::compte-utilisateur adresse" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_address" id="form_address" value="{{ app["authentication"].getUser().get_address() }}" />
<input class="input_element input-xlarge" type="text" name="form_address" id="form_address" value="{{ app["authentication"].getUser().getAddress() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_zip"><strong>{{ "admin::compte-utilisateur code postal" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_zip" id="form_zip" value="{{ app["authentication"].getUser().get_zipcode() }}" />
<input class="input_element input-xlarge" type="text" name="form_zip" id="form_zip" value="{{ app["authentication"].getUser().getZipCode() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_city"><strong>{{ "admin::compte-utilisateur ville" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="{{ app["authentication"].getUser().get_geonameid() }}" />
<input class="input_element input-xlarge geoname_field" type="text" name="form_geonameid" id="form_geonameid" value="{{ app["authentication"].getUser().getGeonameId() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_function"><strong>{{ "admin::compte-utilisateur poste" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().get_position() }}" />
<input class="input_element input-xlarge" type="text" name="form_function" id="form_function" value="{{ app["authentication"].getUser().getActivity() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_company"><strong>{{ "admin::compte-utilisateur societe" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_company" id="form_company" value="{{ app["authentication"].getUser().get_company() }}" />
<input class="input_element input-xlarge" type="text" name="form_company" id="form_company" value="{{ app["authentication"].getUser().getCompany() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_activity"><strong>{{ "admin::compte-utilisateur activite" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().get_job() }}" />
<input class="input_element input-xlarge" type="text" name="form_activity" id="form_activity" value="{{ app["authentication"].getUser().getJob() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_phone"><strong>{{ "admin::compte-utilisateur telephone" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_phone" id="form_phone" value="{{ app["authentication"].getUser().get_tel() }}" />
<input class="input_element input-xlarge" type="text" name="form_phone" id="form_phone" value="{{ app["authentication"].getUser().getPhone() }}" />
<p class="form_alert help-block"></p>
</div>
</div>
<div class="control-group">
<label class="form_label control-label" for="form_fax"><strong>{{ "admin::compte-utilisateur fax" | trans }}</strong></label>
<div class="controls">
<input class="input_element input-xlarge" type="text" name="form_fax" id="form_fax" value="{{ app["authentication"].getUser().get_fax() }}" />
<input class="input_element input-xlarge" type="text" name="form_fax" id="form_fax" value="{{ app["authentication"].getUser().getFax() }}" />
<p class="form_alert help-block"></p>
</div>
</div>

2
templates/web/account/authorized_apps.html.twig
View File

@@ -25,7 +25,7 @@
</a>
{% if application.get_creator() is not none %}
<small>
{% set user_name = application.get_creator().get_display_name() %}
{% set user_name = application.get_creator().getDisplayName() %}
{% trans with {'%user_name%' : user_name} %}par %user_name%{% endtrans %}
</small>
{% endif%}

2
templates/web/account/reset-email.html.twig
View File

@@ -20,7 +20,7 @@
<div class="control-group">
<label class="control-label" for="form_login">{{ "admin::compte-utilisateur identifiant" | trans }}</label>
<div class="controls">
<p id="form_login" style="line-height: 30px;">{{ app["authentication"].getUser().get_login() }}</p>
<p id="form_login" style="line-height: 30px;">{{ app["authentication"].getUser().getLogin() }}</p>
</div>
</div>
<div class="control-group">

6
templates/web/admin/collection/collection.html.twig
View File

@@ -42,9 +42,9 @@
<ul class="unstyled">
{% for user in admins %}
<li>
<label for="adm_{{ user.get_id() }}" class="checkbox">
<input name="admins[]" type="checkbox" value="{{ user.get_id() }}" id="adm_{{ user.get_id() }}" checked />
{{ user.get_display_name() }}
<label for="adm_{{ user.getId() }}" class="checkbox">
<input name="admins[]" type="checkbox" value="{{ user.getId() }}" id="adm_{{ user.getId() }}" checked />
{{ user.getDisplayName() }}
</label>
</li>
{% endfor %}

14
templates/web/admin/connected-users.html.twig
View File

@@ -4,22 +4,22 @@
<span id="tooltip-usr">
<table id="tabledescexp" cellpadding="0" cellspacing="0">
<tr>
<td class="tooltip-title" colspan="2" valign="center" >usr_id : {{ user.get_id() }}</td>
<td class="tooltip-title" colspan="2" valign="center" >usr_id : {{ user.getId() }}</td>
</tr>
<tr>
<td colspan="2" style="height: 10px;"></td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ user.get_display_name() }}</td>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur nom' | trans }} : </strong>{{ user.getDisplayName() }}</td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur societe' | trans }} : </strong>{{ user.get_company() }}</td>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur societe' | trans }} : </strong>{{ user.getCompany() }}</td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur telephone' | trans }} : </strong>{{ user.get_tel() }}</td>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur telephone' | trans }} : </strong>{{ user.getPhone() }}</td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur email' | trans }} : </strong>{{ user.get_email() }}</td>
<td colspan="2"><strong>{{ 'admin::compte-utilisateur email' | trans }} : </strong>{{ user.getEmail() }}</td>
</tr>
<tr>
<td colspan="2"><strong>{{ 'admin::monitor: bases sur lesquelles l\'utilisateur est connecte :' | trans }} :</strong></td>
@@ -102,9 +102,9 @@
<tr title="{{ _self.tooltip_connected_users(row) | e }}" class="{% if loop.index is odd %}odd{% else %}even{% endif %} usrTips" id="TREXP_{{ row.getId()}}">
{% if row.getId() == app['session'].get('session_id') %}
<td style="color:#ff0000"><i>{{ row.getUser(app).get_display_name() }}</i></td>
<td style="color:#ff0000"><i>{{ row.getUser(app).getDisplayName() }}</i></td>
{% else %}
<td>{{ row.getUser(app).get_display_name() }}</td>
<td>{{ row.getUser(app).getDisplayName() }}</td>
{% endif %}
<td>

48
templates/web/admin/editusers.html.twig
View File

@@ -97,7 +97,7 @@
<li>
<a href="#rights_tab">{{ 'Rights' | trans }}</a>
</li>
{% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
{% if main_user is not empty and main_user.isTemplate is empty and main_user.isSpecial is empty %}
<li>
<a href="#user_infos_tab">{{ 'Infos' | trans }}</a>
</li>
@@ -111,14 +111,14 @@
<td>
{% if main_user is not empty %}
{% if main_user.is_special is not empty %}
{% if main_user.get_login() == 'invite' %}
{{ 'Reglages:: reglages d acces guest' | trans }}
{% elseif main_user.get_login() == 'autoregister' %}
{{ 'Reglages:: reglages d inscitpition automatisee' | trans }}
{% if main_user.isSpecial is not empty %}
{% if main_user.getLogin() == 'invite' %}
{{ 'Reglages:: reglages d acces guest' | trans }}
{% elseif main_user.getLogin() == 'autoregister' %}
{{ 'Reglages:: reglages d inscitpition automatisee' | trans }}
{% endif %}
{% else %}
{% set display_name = main_user.get_display_name() %}
{% set display_name = main_user.getDisplayName() %}
{% trans with {'%display_name%' : display_name} %}Edition des droits de %display_name%{% endtrans %}
{% endif %}
{% else %}
@@ -131,7 +131,7 @@
<select name="template">
<option value="">{{ 'boutton::choisir' | trans }}</option>
{% for template in templates %}
<option value="{{ template.get_id() }}">{{ template.get_display_name() }}</option>
<option value="{{ template.getId() }}">{{ template.getDisplayName() }}</option>
{% endfor %}
</select>
<button class="btn" type='button' id='reset_rights'>{{ 'Delete all users rights' | trans }}</button>
@@ -435,7 +435,7 @@
</form>
</div>
{% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
{% if main_user is not empty and main_user.isTemplate is empty and main_user.isSpecial is empty %}
<div id="user_infos_tab" class="PNB" style="top:40px;overflow:auto;">
<form id="user_infos_form">
<table>
@@ -444,7 +444,7 @@
{{ 'admin::compte-utilisateur identifiant' | trans }}
</td>
<td>
<input type="text" value="{{main_user.get_login()}}" readonly="readonly" />
<input type="text" value="{{main_user.getLogin()}}" readonly="readonly" />
</td>
</tr>
<tr>
@@ -453,9 +453,9 @@
</td>
<td>
<select name="gender">
<option {% if main_user.get_gender() == 0 %}selected="selected"{% endif %} value="0" >{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if main_user.get_gender() == 1 %}selected="selected"{% endif %} value="1" >{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if main_user.get_gender() == 2 %}selected="selected"{% endif %} value="2" >{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
<option {% if main_user.getGender() == 0 %}selected="selected"{% endif %} value="0" >{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if main_user.getGender() == 1 %}selected="selected"{% endif %} value="1" >{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if main_user.getGender() == 2 %}selected="selected"{% endif %} value="2" >{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
</select>
</td>
</tr>
@@ -464,7 +464,7 @@
{{ 'admin::compte-utilisateur prenom' | trans }}
</td>
<td>
<input type="text" name="first_name" value="{{main_user.get_firstname()}}"/>
<input type="text" name="first_name" value="{{main_user.getFirstName()}}"/>
</td>
</tr>
<tr>
@@ -472,7 +472,7 @@
{{ 'admin::compte-utilisateur nom' | trans }}
</td>
<td>
<input type="text" name="last_name" value="{{main_user.get_lastname()}}"/>
<input type="text" name="last_name" value="{{main_user.getLastName()}}"/>
</td>
</tr>
<tr>
@@ -480,7 +480,7 @@
{{ 'admin::compte-utilisateur email' | trans }}
</td>
<td>
<input type="text" name="email" value="{{main_user.get_email()}}"/>
<input type="text" name="email" value="{{main_user.getEmail()}}"/>
</td>
</tr>
<tr>
@@ -488,7 +488,7 @@
{{ 'admin::compte-utilisateur adresse' | trans }}
</td>
<td>
<input type="text" name="address" value="{{main_user.get_address()}}"/>
<input type="text" name="address" value="{{main_user.getAddress()}}"/>
</td>
</tr>
<tr>
@@ -496,7 +496,7 @@
{{ 'admin::compte-utilisateur code postal' | trans }}
</td>
<td>
<input type="text" name="zip" value="{{main_user.get_zipcode()}}"/>
<input type="text" name="zip" value="{{main_user.getZipCode()}}"/>
</td>
</tr>
<tr>
@@ -504,7 +504,7 @@
{{ 'admin::compte-utilisateur ville' | trans }}
</td>
<td>
<input type="text" value="{{ main_user.get_geonameid() }}" class="geoname_field" name="geonameid" />
<input type="text" value="{{ main_user.getGeonameId() }}" class="geoname_field" name="geonameid" />
</td>
</tr>
<tr>
@@ -512,7 +512,7 @@
{{ 'admin::compte-utilisateur poste' | trans }}
</td>
<td>
<input type="text" name="function" value="{{main_user.get_position()}}"/>
<input type="text" name="function" value="{{main_user.getActivity()}}"/>
</td>
</tr>
<tr>
@@ -520,7 +520,7 @@
{{ 'admin::compte-utilisateur societe' | trans }}
</td>
<td>
<input type="text" name="company" value="{{main_user.get_company()}}"/>
<input type="text" name="company" value="{{main_user.getCompany()}}"/>
</td>
</tr>
<tr>
@@ -528,7 +528,7 @@
{{ 'admin::compte-utilisateur activite' | trans }}
</td>
<td>
<input type="text" name="activite" value="{{main_user.get_job()}}"/>
<input type="text" name="activite" value="{{main_user.getJob()}}"/>
</td>
</tr>
@@ -537,7 +537,7 @@
{{ 'admin::compte-utilisateur telephone' | trans }}
</td>
<td>
<input type="text" name="telephone" value="{{main_user.get_tel()}}"/>
<input type="text" name="telephone" value="{{main_user.getPhone()}}"/>
</td>
</tr>
<tr>
@@ -545,7 +545,7 @@
{{ 'admin::compte-utilisateur fax' | trans }}
</td>
<td>
<input type="text" name="fax" value="{{main_user.get_fax()}}"/>
<input type="text" name="fax" value="{{main_user.getFax()}}"/>
</td>
</tr>
</table>

2
templates/web/admin/index.html.twig
View File

@@ -52,7 +52,7 @@
dataType: 'json',
data: {
module : 3,
usr : {{ app['authentication'].getUser().get_id() }}
usr : {{ app['authentication'].getUser().getId() }}
},
error: function(){
window.setTimeout("sessionactive();", 10000);

4
templates/web/admin/publications/fiche.html.twig
View File

@@ -143,10 +143,10 @@
{{ publisher.getUsrId() }}
</td>
<td valign="center" align="left">
{{ publisher.getUser(app).get_display_name() }}
{{ publisher.getUser(app).getDisplayName() }}
</td>
<td valign="center" align="left">
{{ publisher.getUser(app).get_email() }}
{{ publisher.getUser(app).getEmail() }}
</td>
<td valign="center" align="center">
{% if publisher.isOwner() == true %}

28
templates/web/admin/users.html.twig
View File

@@ -26,9 +26,9 @@
<a href="{{ path('users_display_import_file') }}" target='right'>{{ 'admin::user: import d\'utilisateurs' | trans }}</a> /
<a href="#" onclick="exportlist();return(false);">{{ 'admin::user: export d\'utilisateurs' | trans }}</a>
<a class="invite_modifier" href="#">{{ 'Reglages:: reglages d acces guest' | trans }}</a>
<input type="hidden" value="{{invite_user.get_id()}}" name="invite_user_id"/>
<input type="hidden" value="{{invite_user.getId()}}" name="invite_user_id"/>
<a class="autoregister_modifier" href="#">{{ 'Reglages:: reglages d inscitpition automatisee' | trans }}</a>
<input type="hidden" value="{{autoregister_user.get_id()}}" name="autoregister_user_id"/>
<input type="hidden" value="{{autoregister_user.getId()}}" name="autoregister_user_id"/>
</p>
<form id="users_page_search" method="post" action="{{ path('admin_users_search') }}" target="_self" class="form-inline">
@@ -47,7 +47,7 @@
<select name="last_model" class="input-medium">
<option value="">{{ 'None' | trans }}</option>
{% for template in templates %}
<option {% if parm['last_model'] == template.get_login() %}selected="selected"{% endif %} value="{{ template.get_login() }}">{{ template.get_login() }}</option>
<option {% if parm['last_model'] == template.getLogin() %}selected="selected"{% endif %} value="{{ template.getLogin() }}">{{ template.getLogin() }}</option>
{% endfor %}
</select>
<button type="submit" class="btn">{{ 'boutton::chercher' | trans }}</button>
@@ -60,7 +60,7 @@
<select name="template_chooser" class="input-medium">
<option value="">{{ 'boutton::choisir' | trans }}</option>
{% for template in templates %}
<option value="{{ template.get_id() }}">{{ template.get_display_name() }}</option>
<option value="{{ template.getId() }}">{{ template.getDisplayName() }}</option>
{% endfor %}
</select>
<button type="submit" class="btn">{{ 'boutton::appliquer' | trans }}</button>
@@ -121,37 +121,37 @@
</thead>
<tbody>
{% for usr in users.get_results %}
<tr class="{% if loop.index is odd %}odd{% else %}even{% endif %}" id="user_{{usr.get_id()}}">
<tr class="{% if loop.index is odd %}odd{% else %}even{% endif %}" id="user_{{usr.getId()}}">
<td style="text-align: center;">
{% if usr.is_template() %}
{% if usr.isTemplate() %}
<img title="{{ 'This is a template' | trans }}" src="/skins/icons/template.png"/>
{% else %}
{% if app['acl'].get(usr).is_phantom() %}
<img title="{{ 'This user has no rights' | trans }}" src="/skins/admin/ghost.png"/>
{% endif %}
{{usr.get_id()}}
{{usr.getId()}}
{% endif %}
</td>
<td>
{{usr.get_login()}}
{{usr.getLogin()}}
</td>
<td>
{{usr.get_firstname()}} {{usr.get_lastname()}}
{{usr.getFirstName()}} {{usr.getLastName()}}
</td>
<td>
{{usr.get_company()}}
{{usr.getCompany()}}
</td>
<td>
{{usr.get_email()}}
{{usr.getEmail()}}
</td>
<td>
{{usr.get_country()}}
{{usr.getCountry()}}
</td>
<td>
{{usr.get_applied_template()}}
{{usr.getLastModel()->getDisplayName()}}
</td>
<td>
{{ app['date-formatter'].getDate(usr.get_creation_date()) }}
{{ app['date-formatter'].getDate(usr.getCreated()) }}
</td>
</tr>
{% endfor %}

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

@@ -55,7 +55,7 @@
</div>
{% else %}
{% if user 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/web/api/auth/native_app_access_token.html.twig
View File

@@ -38,7 +38,7 @@
</div>
{% if user 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/web/client/baskets.html.twig
View File

@@ -60,7 +60,7 @@
</div>
<div class="divexterne" style="height:270px;overflow-x:hidden;overflow-y:auto;position:relative">
{% if selected_basket is not none and selected_basket.getPusher(app) is not none %}
{% set pusher_name = selected_basket.getPusher(app).get_display_name() %}
{% set pusher_name = selected_basket.getPusher(app).getDisplayName() %}
<div class="txtPushClient">
{% trans with {'%pusher_name%' : pusher_name} %}paniers:: panier emis par %pusher_name%{% endtrans %}
</div>

2
templates/web/client/index.html.twig
View File

@@ -445,7 +445,7 @@
dataType: 'json',
data: {
app : 2,
usr : {{ app['authentication'].getUser().get_id() }}
usr : {{ app['authentication'].getUser().getId() }}
},
error: function(){
window.setTimeout("sessionactive();", 10000);

30
templates/web/common/dialog_export.html.twig
View File

@@ -171,7 +171,7 @@
<div>
{{ 'export::mail: destinataire' | trans }}
<input type="text" value="" name="destmail" class="required span4">
{% set my_email = app['authentication'].getUser().get_email() %}
{% set my_email = app['authentication'].getUser().getEmail() %}
{% if my_email != '' %}
<label class="checkbox">
<input type="checkbox" name="reading_confirm" value="1" />
@@ -302,9 +302,9 @@
<label class="control-label" for="sexe">{{ 'Civility' | trans }}</label>
<div class="controls">
<select name="sexe" id="sexe">
<option {% if app['authentication'].getUser().get_gender == 0 %}selected="selected"{% endif %} value="0">{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if app['authentication'].getUser().get_gender == 1 %}selected="selected"{% endif %} value="1">{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if app['authentication'].getUser().get_gender == 2 %}selected="selected"{% endif %} value="2">{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
<option {% if app['authentication'].getUser().getGender == 0 %}selected="selected"{% endif %} value="0">{{ 'admin::compte-utilisateur:sexe: mademoiselle' | trans }}</option>
<option {% if app['authentication'].getUser().getGender == 1 %}selected="selected"{% endif %} value="1">{{ 'admin::compte-utilisateur:sexe: madame' | trans }}</option>
<option {% if app['authentication'].getUser().getGender == 2 %}selected="selected"{% endif %} value="2">{{ 'admin::compte-utilisateur:sexe: monsieur' | trans }}</option>
</select>
</div>
</div>
@@ -312,70 +312,70 @@
<div class="control-group">
<label class="control-label" for="usr_lastname">{{ 'admin::compte-utilisateur nom' | trans }}</label>
<div class="controls">
<input id='usr_lastname' type="text" name="usr_nom" class="required" value="{{ app['authentication'].getUser().get_lastname() }}"/>
<input id='usr_lastname' type="text" name="usr_nom" class="required" value="{{ app['authentication'].getUser().getLastName() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_firstname">{{ 'admin::compte-utilisateur prenom' | trans }}</label>
<div class="controls">
<input type="text" name="usr_prenom" class="required" id="usr_firstname" value="{{ app['authentication'].getUser().get_firstname() }}"/>
<input type="text" name="usr_prenom" class="required" id="usr_firstname" value="{{ app['authentication'].getUser().getFirstName() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_mail"> {{ 'admin::compte-utilisateur email' | trans }}</label>
<div class="controls">
<input class="required" type="text" name="usr_mail" id="usr_mail" value="{{ app['authentication'].getUser().get_email() }}"/>
<input class="required" type="text" name="usr_mail" id="usr_mail" value="{{ app['authentication'].getUser().ggetEmail) }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_tel">{{ 'admin::compte-utilisateur telephone' | trans }}</label>
<div class="controls">
<input type="text" name="tel" id="usr_tel" value="{{ app['authentication'].getUser().get_tel() }}"/>
<input type="text" name="tel" id="usr_tel" value="{{ app['authentication'].getUser().getPhone() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_societe">{{ 'admin::compte-utilisateur societe' | trans }}</label>
<div class="controls">
<input type="text" name="societe" id="usr_societe" value="{{ app['authentication'].getUser().get_company() }}"/>
<input type="text" name="societe" id="usr_societe" value="{{ app['authentication'].getUser().getCompany() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_function">{{ 'admin::compte-utilisateur poste' | trans }}</label>
<div class="controls">
<input type="text" name="fonction" id="usr_fonction" value="{{ app['authentication'].getUser().get_job() }}"/>
<input type="text" name="fonction" id="usr_fonction" value="{{ app['authentication'].getUser().getJob() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_address">{{ 'admin::compte-utilisateur adresse' | trans }}</label>
<div class="controls">
<input class="required" type="text" name="adresse" id="usr_adresse" value="{{ app['authentication'].getUser().get_address() }}"/>
<input class="required" type="text" name="adresse" id="usr_adresse" value="{{ app['authentication'].getUser().getAddress() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_zip_code">{{ 'admin::compte-utilisateur code postal' | trans }}</label>
<div class="controls">
<input id="usr_zip_code" type="text" name="cpostal" name="cpostal" class="required" value="{{ app['authentication'].getUser().get_zipcode() }}"/>
<input id="usr_zip_code" type="text" name="cpostal" name="cpostal" class="required" value="{{ app['authentication'].getUser().getZipCode() }}"/>
</div>
</div>
<div class="control-group">
<label class="control-label" for="command_geoname_field">{{ 'admin::compte-utilisateur ville' | trans }}</label>
<div class="controls">
<input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" value="{{ app['authentication'].getUser().get_geonameid() }}" />
<input class="required geoname_field" type="text" name="geonameid" id="command_geoname_field" value="{{ app['authentication'].getUser().getGeonameId() }}" />
</div>
</div>
<div class="control-group">
<label class="control-label" for="usr_fax">{{ 'admin::compte-utilisateur fax' | trans }}</label>
<div class="controls">
<input type="text" id="usr_fax" name="fax" value="{{ app['authentication'].getUser().get_fax() }}"/>
<input type="text" id="usr_fax" name="fax" value="{{ app['authentication'].getUser().getFax() }}"/>
</div>
</div>
@@ -652,7 +652,7 @@
$('input[name="obj[]"]:checked', $('#download')).each(function(i,n){
$('input[name="obj[]"][value="'+$(n).val()+'"]', $('#sendmail')).attr('checked', true);
});
$('input[name="destmail"]', $('#sendmail')).val("{{app['authentication'].getUser().get_email()}}");
$('input[name="destmail"]', $('#sendmail')).val("{{app['authentication'].getUser().getEmail()}}");
var tabs = $('.tabs', dialog.getDomElement());
tabs.tabs("option", "active", 1);

2
templates/web/common/menubar.html.twig
View File

@@ -145,7 +145,7 @@
{% else %}
<a target="_blank" href="{{ path('account') }}" title="{{ 'login:: Mon compte' | trans }}">
<span>
{{app['authentication'].getUser().get_login()}}
{{app['authentication'].getUser().getLogin()}}
</span>
</a>
{% endif %}

2
templates/web/lightbox/IE6/agreement_box.html.twig
View File

@@ -27,7 +27,7 @@
{% set classuser = 'disagree' %}
{% endif %}
{% set participant = validation_data.getParticipant().getUser(app) %}
<li class="{% if participant.get_id() == app['authentication'].getUser().get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
<li class="{% if participant.getId() == app['authentication'].getUser().getId() %}me{% endif %} {{classuser}} userchoice">{{participant.getDisplayName()}}</li>
{% endif %}
{% endfor %}
</ul>

2
templates/web/lightbox/agreement_box.html.twig
View File

@@ -25,7 +25,7 @@
{% set classuser = 'disagree' %}
{% endif %}
{% set participant = choice.getParticipant().getUser(app) %}
<li class="{% if participant.get_id() == app['authentication'].getUser().get_id() %}me{% endif %} {{classuser}} userchoice">{{participant.get_display_name()}}</li>
<li class="{% if participant.getId() == app['authentication'].getUser().getId() %}me{% endif %} {{classuser}} userchoice">{{participant.getDisplayName()}}</li>
{% endif %}
{% endfor %}
</ul>

2
templates/web/lightbox/basket_content_report.html.twig
View File

@@ -33,7 +33,7 @@
{% set imguser = '<img src="/skins/lightbox/disagree.png" />' %}
{% set styleuser = '' %}
{% endif %}
<b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser(app).get_display_name()}}</b>
<b style="{{styleuser}}">{{imguser|raw}} {{validationDatas.getParticipant().getUser(app).getDisplayName()}}</b>
{% if validationDatas.getNote() != '' %}
: {{validationDatas.getNote()|nl2br}}
{% endif %}

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

@@ -8,9 +8,9 @@
<hr/>
{% for validationDatas in basket_element.getValidationDatas() %}
{% if validationDatas.getNote() != '' %}
<div class="note_wrapper ui-corner-all {% if validationDatas.getParticipant().getUser(app).get_id() == app['authentication'].getUser().get_id() %}my_note{% endif %} ">
<div class="note_wrapper ui-corner-all {% if validationDatas.getParticipant().getUser(app).getId() == app['authentication'].getUser().getId() %}my_note{% endif %} ">
<span class="note_author title15">
{{validationDatas.getParticipant().getUser(app).get_display_name()}}
{{validationDatas.getParticipant().getUser(app).getDisplayName()}}
</span> : {{ validationDatas.getNote()|nl2br }}
</div>
{% endif %}

10
templates/web/login/common/macros.html.twig
View File

@@ -122,16 +122,16 @@
<div class="authentication-user-pres-phraseanet well">
<ul class="unstyled">
<li class="one-line">
<i class="icon-user"></i>{{ user.get_display_name() }}
<i class="icon-user"></i>{{ user.getDisplayName() }}
</li>
{% if user.get_email() %}
{% if user.getEmail() %}
<li class="one-line">
<i class="icon-envelope"></i>{{ user.get_email() }}
<i class="icon-envelope"></i>{{ user.getEmail() }}
</li>
{% endif %}
{% if user.get_company() %}
{% if user.getCompany() %}
<li class="one-line">
<i class="icon-briefcase"></i>{{ user.get_company() }}
<i class="icon-briefcase"></i>{{ user.getCompany() }}
</li>
{% endif %}
</ul>

12
templates/web/prod/Tooltip/User.html.twig
View File

@@ -1,7 +1,7 @@
{% extends 'prod/Tooltip/Tooltip.html.twig' %}
{% set title %}
app['authentication'].getUser().get_display_name()
app['authentication'].getUser().getDisplayName()
{% endset %}
{% set width = 300 %}
{% set maxwidth = null %}
@@ -12,12 +12,12 @@
<img style="margin:14px 8px;" src="/skins/icons/user.png"/>
</div>
<div class="PNB" style="left:100px;">
<h1> {{ app['authentication'].getUser().get_display_name() }}</h1>
<h1> {{ app['authentication'].getUser().getDisplayName() }}</h1>
<ul>
<li>{{ app['authentication'].getUser().get_email() }}</li>
<li>{{ app['authentication'].getUser().get_company() }}</li>
<li>{{ app['authentication'].getUser().get_job() }}</li>
<li>{{ app['authentication'].getUser().get_position() }}</li>
<li>{{ app['authentication'].getUser().getEmail() }}</li>
<li>{{ app['authentication'].getUser().getCompany() }}</li>
<li>{{ app['authentication'].getUser().getJob() }}</li>
<li>{{ app['authentication'].getUser().getActivity() }}</li>
</ul>
</div>
</div>

8
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -39,7 +39,7 @@
<div class="PNB" style="top:40px;bottom:auto;height:40px;background-color:#404040;">
<div class="PNB10">
<p>
{% set user_name = '<a tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).get_id() }) ~ '" href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% set user_name = '<a tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
</p>
</div>
@@ -58,9 +58,9 @@
{% set list_participants = list_participants ~ ', ' %}
{% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser(app).get_id() }) ~ '" href="/user/'
~ Participant.getUser(app).get_id() ~ '/">'
~ Participant.getUser(app).get_display_name
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser(app).getId() }) ~ '" href="/user/'
~ Participant.getUser(app).getId() ~ '/">'
~ Participant.getUser(app).getDisplayName
~ '</a>' %}
{% endfor %}
{% trans with {'%list_participants%' : list_participants} %}Sent for validation to %list_participants%{% endtrans %}

6
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -69,7 +69,7 @@
{% if Basket.getPusher(app) %}
<p>
{% set user_name = '<a href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).get_id() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% set user_name = '<a href="/user/' ~ Basket.getPusher(app).get_id() ~ '/" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Basket.getPusher(app).getId() }) ~ '" class="UserTips">' ~ Basket.getPusher(app).get_display_name() ~ '</a>' %}
{% trans with {'%user_name%' : user_name} %}Received from %user_name%{% endtrans %}
</p>
{% endif %}
@@ -84,8 +84,8 @@
{% set list_participants = list_participants ~ ', ' %}
{% endif %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser(app).get_id() }) ~ '" href="/user/' ~ Participant.getUser(app).get_id() ~ '/">' %}
{% set list_participants = list_participants ~ Participant.getUser(app).get_display_name %}
{% set list_participants = list_participants ~ '<a class="UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : Participant.getUser(app).getId() }) ~ '" href="/user/' ~ Participant.getUser(app).getId() ~ '/">' %}
{% set list_participants = list_participants ~ Participant.getUser(app).getDisplayName %}
{% set list_participants = list_participants ~ '</a>' %}
{% endfor %}
{% trans with {'%list_participants%' : list_participants} %}Sent for validation to %list_participants%{% endtrans %}

4
templates/web/prod/WorkZone/Macros.html.twig
View File

@@ -112,7 +112,7 @@
{% endif %}
{% if basket.getPusher(app) %}
<td>
{% set pusher = basket.getPusher(app).get_display_name() %}
{% set pusher = basket.getPusher(app).getDisplayName() %}
<img
class="basketTips"
title="{% trans with {'%pusher%' : pusher} %}paniers:: panier recu de %pusher%{% endtrans %}"
@@ -355,7 +355,7 @@
{% for choice in basket_element.getValidationDatas() %}
{% if basket.getValidation().getParticipant(app['authentication'].getUser(), app).getCanSeeOthers() or choice.getParticipant().getUser(app) == app['authentication'].getUser() %}
<tr>
<td> {{ choice.getParticipant().getUser(app).get_display_name() }} </td>
<td> {{ choice.getParticipant().getUser(app).getDisplayName() }} </td>
<td>
{% if choice.getParticipant().getCanAgree() %}
{% if choice.getAgreement() == true %}

8
templates/web/prod/actions/Feedback/List-Share.html.twig
View File

@@ -29,11 +29,11 @@
<img src="/skins/icons/user.png"/>
</td>
<td style="width:150px;padding:5px;">
{{ owner.getUser(app).get_display_name() }}
<input type="hidden" name="usr_id" value="{{ owner.getUser(app).get_id() }}" />
{{ owner.getUser(app).getDisplayName() }}
<input type="hidden" name="usr_id" value="{{ owner.getUser(app).getId() }}" />
</td>
<td style="padding-right:10px;min-width:100px;">
{% if app['authentication'].getUser().get_id() == owner.getUser(app).get_id() %}
{% if app['authentication'].getUser().ggetId()== owner.getUser(app).gegetId()}
{% if owner.getRole() == constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_ADMIN') %}
{{ 'You are Admin' | trans }}
{% endif %}
@@ -53,7 +53,7 @@
{% endif %}
</td>
<td style="width:15px">
{% if app['authentication'].getUser().get_id() != owner.getUser(app).get_id() %}
{% if app['authentication'].getUser().getgetId() owner.getUser(app).getId() %}
<a href="#" class="deleter">
<img src="/skins/prod/Push/close_badge.png" title="{{ 'Remove' | trans }}"/>
</a>

20
templates/web/prod/actions/Feedback/ListsMacros.html.twig
View File

@@ -59,26 +59,26 @@
{% for user in results %}
<tr class="{% if list.has(user, app) %} selected {% endif %}{% if loop.index is odd %} odd {% endif %}">
<td>
{{ user.get_login() }}
<input name="usr_id" value="{{ user.get_id() }}" type="hidden" />
{{ user.getLogin() }}
<input name="usr_id" value="{{ user.getId() }}" type="hidden" />
</td>
<td>
{{ user.get_firstname() }} / {{ user.get_lastname() }}
{{ user.getFirstName() }} / {{ user.getLastName() }}
</td>
<td>
{{ user.get_company() }}
{{ user.getCompany() }}
</td>
<td>
{{ user.get_email() }}
{{ user.getEmail() }}
</td>
<td>
{{ user.get_country() }}
{{ user.getCountry() }}
</td>
<td>
{{ user.get_login() }}
{{ user.getLogin() }}
</td>
<td>
{{ app['date-formatter'].getDate(user.get_creation_date()) }}
{{ app['date-formatter'].getDate(user.getCreated()) }}
</td>
</tr>
{% endfor %}
@@ -176,7 +176,7 @@
{% macro badgeReadonly(entry, role) %}
<div class="badge">
<input type="hidden" value="{{ entry.getUser(app).get_id() }}" name="id">
<input type="hidden" value="{{ entry.getUser(app).getId() }}" name="id">
{% if role >= constant('Alchemy\\Phrasea\\Model\\Entities\\UsrListOwner::ROLE_EDITOR') %}
<a class="deleter" href="#">
<img src="/skins/prod/Push/close_badge.png">
@@ -188,7 +188,7 @@
<img src="/skins/icons/user.png"/>
</td>
<td class="infos" >
<span class="name">{{ entry.getUser(app).get_display_name() }}</span>
<span class="name">{{ entry.getUser(app).getDisplayName() }}</span>
<span class="subtite"></span>
</td>
</tr>

10
templates/web/prod/actions/Push.html.twig
View File

@@ -104,9 +104,9 @@
{% set recommendation = recommendation %}
{% endif %}
{% set recommendation = recommendation
~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : user.get_id() }) ~ '">'
~ '<input type="hidden" name="usr_id" value="' ~ user.get_id() ~ '" />'
~ user.get_display_name()
~ ' <a href="#" class="recommended_users UserTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : user.getId() }) ~ '">'
~ '<input type="hidden" name="usr_id" value="' ~ user.getId() ~ '" />'
~ user.getDisplayName()
~ '</a>' %}
{% endif %}
{% endfor %}
@@ -139,8 +139,8 @@
<img src="/skins/icons/user.png"/>
</td>
<td>
{{ user.get_display_name() }}
<input type="hidden" name="usr_id" value="{{ user.get_id() }}" />
{{ user.getDisplayName() }}
<input type="hidden" name="usr_id" value="{{ user.getId() }}" />
</td>
<td>
<a href="#" class="adder">{{ 'Add' | trans }}</a>

4
templates/web/prod/actions/publish/publish.html.twig
View File

@@ -46,9 +46,9 @@
<label for="feed_add_subtitle">{{ 'publication : sous titre' | trans }}</label>
<textarea id="feed_add_subtitle" name="subtitle">{{desc}}</textarea>
<label for="feed_add_author_name">{{ 'publication : autheur' | trans }}</label>
<input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ app['authentication'].getUser().get_display_name() }}" />
<input class="required_text" type="text" name="author_name" id="feed_add_author_name" value="{{ app['authentication'].getUser().getDisplayName() }}" />
<label for="feed_add_author_mail">{{ 'publication : email autheur' | trans }}</label>
<input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ app['authentication'].getUser().get_email() }}" />
<input class="required_text" type="text" name="author_mail" id="feed_add_author_mail" value="{{ app['authentication'].getUser().getEmail() }}" />
</div>
</div>
<div class="PNB" style="width:50%;left:auto;">

2
templates/web/prod/index.html.twig
View File

@@ -1032,7 +1032,7 @@
dataType: "json",
data: {
module : 1,
usr : {{app['authentication'].getUser().get_id()}}
usr : {{app['authentication'].getUser().getId()}}
},
error: function(){
window.setTimeout("sessionactive();", 10000);

2
templates/web/prod/orders/order_box.html.twig
View File

@@ -42,7 +42,7 @@
{% for order in orders %}
{% set deadline = app['date-formatter'].getPrettyString(order.getDeadline()) %}
<tr id="order_{{ order.getId() }}" class="order_row" {{ current_date > order.getDeadline() ? "style=color:#777": "" }}>
<td>{{ order.getUser(app).get_display_name() }}</td>
<td>{{ order.getUser(app).getDisplayName() }}</td>
<td>{{ app['date-formatter'].getPrettyString(order.getCreatedOn()) }}</td>
<td>
{% if deadline != '' %}

4
templates/web/prod/orders/order_item.html.twig
View File

@@ -1,5 +1,5 @@
{% import 'common/thumbnail.html.twig' as thumbnail %}
{% set displayName = order.getUser(app).get_display_name() %}
{% set displayName = order.getUser(app).getDisplayName() %}
<div class="page-header">
<h1>{% trans with {'%displayName%' : displayName} %}%displayName% wants to place an order{% endtrans %}</h1>
@@ -29,7 +29,7 @@
<table class="table" style="color:#333;">
<tr>
<td>{{ 'Destinataire' | trans }}</td>
<td>{{ displayName }}({{ order.getUser(app).get_email() }})</td>
<td>{{ displayName }}({{ order.getUser(app).getEmail() }})</td>
</tr>
<tr>
<td>{{ 'Date de commande' | trans }}</td>

4
templates/web/prod/preview/short_history.html.twig
View File

@@ -56,8 +56,8 @@
{% endif %}
<span class="actor">
{% if app['acl'].get(app['authentication'].getUser()).has_right_on_base(record.get_base_id(), 'canreport') %}
{% if done['user'] and done['user'].get_id() != app['authentication'].getUser().get_id() %}
{% set user_infos = done['user'].get_display_name() %}
{% if done['user'] and done['user'].getId() != app['authentication'].getUser().getId() %}
{% set user_infos = done['user'].getDisplayName() %}
{% trans with {'%user_infos%' : user_infos} %}report:: par %user_infos%{% endtrans %}
{% endif %}
{% endif %}

2
templates/web/prod/upload/lazaret.html.twig
View File

@@ -268,7 +268,7 @@
<p>{{ "Date" | trans }} : <span class="info">{{ app['date-formatter'].getPrettyString(file.getCreated()) }}</span></p>
{% if file.getSession().getUser(app) is not none %}
<p>
{% set username = '<a href="#" class="username userTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : file.getSession().getUser(app).get_id() }) ~ '/">' ~ file.getSession().getUser(app).get_display_name() ~ '</a>' %}
{% set username = '<a href="#" class="username userTips" tooltipsrc="' ~ path('prod_tooltip_user', { 'usr_id' : file.getSession().getUser(app).getId() }) ~ '/">' ~ file.getSession().getUser(app).getDisplayName() ~ '</a>' %}
{% trans with {'%username%' : username} %}Uploaded by : %username%{% endtrans %}
</p>
{% endif %}

2
templates/web/report/all_content.html.twig
View File

@@ -12,7 +12,7 @@
{% block javascript %}
<script type="text/javascript" >
var usrId = '{{ dashboard.usr.get_id() }}' ;
var usrId = '{{ dashboard.usr.getId() }}' ;
var language = {
valider : '{{ "boutton::valider" | trans }}',

2
templates/web/thesaurus/thesaurus.html.twig
View File

@@ -102,7 +102,7 @@
dataType: 'json',
data: {
module : 5,
usr : {{ app['authentication'].getUser().get_id() }}
usr : {{ app['authentication'].getUser().getId() }}
},
error: function(){
window.setTimeout("sessionactive();", 10000);