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 Inteface References

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-11-19 12:27:51 +01:00
parent bd2f777ab9
commit 53ae0ccc24
44 changed files with 795 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
templates/web/admin/user/demand.html.twig
View File

@@ -202,37 +202,38 @@
<div class="registration-wrapper PNB" style="top:160px;bottom: 50px;overflow: auto">
<div id="tab_demandes">
{% set tableColls = table['coll'] %}
{% for row in table['user'] %}
{% for row in table['users'] %}
{% set user = row['user'] %}
<div class="well well-small">
<table class="table" style="table-layout: fixed;">
<tr>
<span>
{{ app['date-formatter'].getPrettyString(row["date_modif"]) }}
{{ app['date-formatter'].getPrettyString(row["date_demand"]) }}
</span>
</tr>
<tr>
<td>
{% set colls = tableColls[row['usr_id']] %}
{% set colls = tableColls[user.getId()] %}
<dl class="dl-horizontal">
<dt>{{ 'admin::compte-utilisateur identifiant' | trans }}</dt>
<dd>{{ row['usr_login'] }}</dd>
<dd>{{ user.getLogin() }}</dd>
<dt>{{ 'admin::compte-utilisateur nom' | trans }} / {{ 'admin::compte-utilisateur prenom' | trans }}</dt>
<dd>{{ row['usr_nom'] }} {{ row['usr_prenom'] }}</dd>
<dd>{{ user.getLastName() }} {{ user.getFirstName() }}</dd>
<dt>{{ 'admin::compte-utilisateur email' | trans }}</dt>
<dd>{{ row['usr_mail'] }}</dd>
<dd>{{ user.getEmail() }}</dd>
<dt>{{ 'admin::compte-utilisateur societe' | trans }}</dt>
<dd>{{ row['societe'] }}</dd>
<dd>{{ user.getCompany() }}</dd>
<dt>{{ 'admin::compte-utilisateur poste' | trans }}</dt>
<dd>{{ row['fonction'] }}</dd>
<dd>{{ user.getJob() }}</dd>
<dt>{{ 'admin::compte-utilisateur activite' | trans }}</dt>
<dd>{{ row['activite'] }}</dd>
<dd>{{ user.getActivity() }}</dd>
<dt>{{ 'admin::compte-utilisateur telephone' | trans }}</dt>
<dd>{{ row['tel'] }}</dd>
<dd>{{ user.getPhone() }}</dd>
<dt>{{ 'admin::compte-utilisateur adresse' | trans }}</dt>
<dd>{{ row['adresse'] }}</dd>
<dd>{{ row['cpostal'] }}</dd>
<dd>{{ row['ville'] }}</dd>
<dd>{{ row['pays'] }}</dd>
<dd>{{ user.getAddress() }}</dd>
<dd>{{ user.getZipCode() }}</dd>
<dd>{{ user.getCity() }}</dd>
<dd>{{ user.getCountry() }}</dd>
</dl>
</td>
<td>
@@ -259,10 +260,10 @@
</td>
<td>
<div>{{ 'admin:: appliquer le modele' | trans }}</div>
<select name="template[]" id="model_{{ row['usr_id'] }}" onchange="modelChecker('{{ row['usr_id'] }}')">
<select name="template[]" id="{{ 'model_' ~ user.getId() }}" onchange="modelChecker('{{ user.getId() }}')">
<option value="">{{ 'None' | trans }}</option>
{% for model in models %}
<option value="{{ row['usr_id'] }}_{{ model['usr_id'] }}">{{ model['usr_login'] }}</option>
<option value="{{ user.getId() ~ '_' ~ model.getId() }}">{{ model.getLogin() }}</option>
{% endfor %}
</select>
</td>

2
templates/web/admin/user/import/view.html.twig
View File

@@ -34,7 +34,7 @@
<textarea class="hidden" name="sr_columns">{{ columns_serialized }}</textarea>
<select name="modelToApply">
{% for model in models %}
<option value='{{ model['usr_id'] }}'>{{ model['usr_login'] }}</option>
<option value='{{ model.getId() }}'>{{ model.getLogin() }}</option>
{% endfor %}
</select>
<div class="form-actions">