Remove User_Adapter

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

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>

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>