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

Merge branch 'master' into PHRAS-2705-basket-browser-windows-nok

Browse Source
This commit is contained in:
Nicolas Maillat
2019-09-06 16:24:47 +02:00
committed by GitHub
parent da6ce86210 2c27c5d8cd
commit 880272ae47
4 changed files with 70 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -512,7 +512,7 @@
{{ 'admin::compte-utilisateur poste' | trans }}
</td>
<td>
<input type="text" name="function" value="{{main_user.getActivity()}}"/>
<input type="text" name="function" value="{{main_user.getJob()}}"/>
</td>
</tr>
<tr>
@@ -528,7 +528,7 @@
{{ 'admin::compte-utilisateur activite' | trans }}
</td>
<td>
<input type="text" name="activite" value="{{main_user.getJob()}}"/>
<input type="text" name="activite" value="{{main_user.getActivity()}}"/>
</td>
</tr>