Mascali/raspisms
1
0
Fork 0
mirror of https://github.com/RaspbianFrance/raspisms.git synced 2025-06-07 07:06:26 +02:00
Code Issues Projects Releases Wiki Activity

revert unwanted change to publics/User, fix errors phone & Settings

Browse source
This commit is contained in:
osaajani 2019-11-14 23:09:56 +01:00
parent 6d9b1289fd
commit 18c7cb019d
7 changed files with 47 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
controllers/publics/Phone.php
View file

@ -37,7 +37,7 @@ class Phone extends \descartes\Controller
{
$id_user = $_SESSION['user']['id'];
$page = (int) $page;
$phones = $this->internal_phone->list_for_user($_SESSION['user']['id']$id_user, 25, $page);
$phones = $this->internal_phone->list_for_user($id_user, 25, $page);
$adapters = [];
$adapters_metas = $this->internal_adapter->list_adapters();
@ -163,7 +163,7 @@ class Phone extends \descartes\Controller
}
$success = $this->internal_phone->create($_SESSION['user']['id'], $id_user, $number, $adapter, $adapter_datas);
$success = $this->internal_phone->create($id_user, $number, $adapter, $adapter_datas);
if (!$success)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce téléphone.');

2
controllers/publics/Setting.php
View file

@ -60,7 +60,7 @@ namespace controllers\publics;
return $this->redirect(\descartes\Router::url('Setting', 'show'));
}
$update_setting_result = $this->internal_setting->update_for_user($_SESSION['user']['id'], $_SESSION['user']['id'], $setting_name, $setting_value);
$update_setting_result = $this->internal_setting->update_for_user($_SESSION['user']['id'], $setting_name, $setting_value);
if (false === $update_setting_result)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de mettre à jour ce réglage.');

6
controllers/publics/User.php
View file

@ -40,7 +40,7 @@ class User extends \descartes\Controller
public function list($page = 0)
{
$page = (int) $page;
$users = $this->internal_user->list_for_user($_SESSION['user']['id'], 25, $page);
$users = $this->internal_user->list(25, $page);
$this->render('user/list', ['users' => $users]);
}
@ -71,7 +71,7 @@ class User extends \descartes\Controller
$ids = $_GET['ids'] ?? [];
foreach ($ids as $id)
{
$this->internal_user->delete_for_user($_SESSION['user']['id'], $id);
$this->internal_user->delete($id);
}
return $this->redirect(\descartes\Router::url('User', 'list'));
@ -122,7 +122,7 @@ class User extends \descartes\Controller
return $this->redirect(\descartes\Router::url('User', 'add'));
}
$user_id = $this->internal_user->create($_SESSION['user']['id'], $email, $password, $admin);
$user_id = $this->internal_user->create($email, $password, $admin);
if (!$user_id)
{
\FlashMessage\FlashMessage::push('danger', 'Impossible de créer ce user.');