lapervenche/ZwiiCampus
1
0
Fork 0
forked from ZwiiCMS-Team/ZwiiCampus
Code Pull Requests Activity

Améliore la table profil

Browse Source
This commit is contained in:
Fred Tempez 2023-11-30 13:52:14 +01:00
parent 45abb7fccc
commit d14eb9f6a8
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
core/module/user/user.php
View File

@ -1232,9 +1232,9 @@ class user extends common
$item['nom'], $item['nom'],
$item['prenom'], $item['prenom'],
self::$groups[$item['groupe']], self::$groups[$item['groupe']],
($this->getData(['profil', $item['groupe'], $item['profil'], 'name']) !== null ) empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']))
? $this->getData(['profil', $item['groupe'], $item['profil'], 'name']) ? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])])
: $item['profil'], : $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']),
$item['prenom'], $item['prenom'],
helper::filter($item['email'], helper::FILTER_MAIL), helper::filter($item['email'], helper::FILTER_MAIL),
$item['tags'], $item['tags'],
@ -1296,9 +1296,9 @@ class user extends common
$item['nom'], $item['nom'],
$item['prenom'], $item['prenom'],
self::$groups[$item['groupe']], self::$groups[$item['groupe']],
($this->getData(['profil', $item['groupe'], $item['profil'], 'name']) !== null ) empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']))
? $this->getData(['profil', $item['groupe'], $item['profil'], 'name']) ? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])])
: $item['profil'], : $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']),
$item['prenom'], $item['prenom'],
$item['email'], $item['email'],
$item['tags'], $item['tags'],

3
core/module/user/view/index/index.js.php
View File

@ -25,7 +25,8 @@ $(document).ready((function () {
$('#dataTables').DataTable({ $('#dataTables').DataTable({
language: { language: {
url: "core/vendor/datatables/french.json" url: "core/vendor/datatables/french.json",
"paging": false
} }
}); });
})); }));