diff --git a/core/module/user/user.php b/core/module/user/user.php index 33c9be7..aeadba1 100644 --- a/core/module/user/user.php +++ b/core/module/user/user.php @@ -1232,9 +1232,9 @@ class user extends common $item['nom'], $item['prenom'], self::$groups[$item['groupe']], - ($this->getData(['profil', $item['groupe'], $item['profil'], 'name']) !== null ) - ? $this->getData(['profil', $item['groupe'], $item['profil'], 'name']) - : $item['profil'], + empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name'])) + ? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]) + : $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']), $item['prenom'], helper::filter($item['email'], helper::FILTER_MAIL), $item['tags'], @@ -1296,9 +1296,9 @@ class user extends common $item['nom'], $item['prenom'], self::$groups[$item['groupe']], - ($this->getData(['profil', $item['groupe'], $item['profil'], 'name']) !== null ) - ? $this->getData(['profil', $item['groupe'], $item['profil'], 'name']) - : $item['profil'], + empty($this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name'])) + ? helper::translate(self::$groups[(int) $this->getData(['user', $userId, 'group'])]) + : $this->getData(['profil', $this->getData(['user', $userId, 'group']), $this->getData(['user', $userId, 'profil']), 'name']), $item['prenom'], $item['email'], $item['tags'], diff --git a/core/module/user/view/index/index.js.php b/core/module/user/view/index/index.js.php index 366219f..42b68df 100644 --- a/core/module/user/view/index/index.js.php +++ b/core/module/user/view/index/index.js.php @@ -25,7 +25,8 @@ $(document).ready((function () { $('#dataTables').DataTable({ language: { - url: "core/vendor/datatables/french.json" + url: "core/vendor/datatables/french.json", + "paging": false } }); })); \ No newline at end of file