From 772804add8095eea9b3ec2a832c2f82fbb9a6fd5 Mon Sep 17 00:00:00 2001 From: Frédéric Guillot Date: Wed, 31 Dec 2014 12:37:15 -0500 Subject: Acl refactoring --- app/Action/Base.php | 2 +- app/Action/TaskAssignCurrentUser.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/Action') diff --git a/app/Action/Base.php b/app/Action/Base.php index 5133c7db..0d8bd565 100644 --- a/app/Action/Base.php +++ b/app/Action/Base.php @@ -11,7 +11,7 @@ use Pimple\Container; * @package action * @author Frederic Guillot * - * @property \Model\Acl $acl + * @property \Model\UserSession $userSession * @property \Model\Comment $comment * @property \Model\Task $task * @property \Model\TaskCreation $taskCreation diff --git a/app/Action/TaskAssignCurrentUser.php b/app/Action/TaskAssignCurrentUser.php index b2015100..ff3aaee1 100644 --- a/app/Action/TaskAssignCurrentUser.php +++ b/app/Action/TaskAssignCurrentUser.php @@ -62,13 +62,13 @@ class TaskAssignCurrentUser extends Base */ public function doAction(array $data) { - if (! $this->acl->isLogged()) { + if (! $this->userSession->isLogged()) { return false; } $values = array( 'id' => $data['task_id'], - 'owner_id' => $this->acl->getUserId(), + 'owner_id' => $this->userSession->getId(), ); return $this->taskModification->update($values); -- cgit v1.2.3