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

@@ -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 %}

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>

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>

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);

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 %}

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 %}