From 41e796c52aa693d13636b54efe15705eaec27f3f Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sat, 20 Sep 2014 14:49:31 +0200
Subject: Models refactoring/improvements

---
 app/Controller/Base.php | 2 +-
 app/Controller/Task.php | 2 +-
 app/Controller/User.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/Controller')

diff --git a/app/Controller/Base.php b/app/Controller/Base.php
index cc180158..8f822f3d 100644
--- a/app/Controller/Base.php
+++ b/app/Controller/Base.php
@@ -269,7 +269,7 @@ abstract class Base
      */
     protected function getTask()
     {
-        $task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
+        $task = $this->task->getDetails($this->request->getIntegerParam('task_id'));
 
         if (! $task) {
             $this->notfound();
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 5de25a0e..eddb61d5 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -60,7 +60,7 @@ class Task extends Base
             $this->forbidden(true);
         }
 
-        $task = $this->task->getById($this->request->getIntegerParam('task_id'), true);
+        $task = $this->task->getDetails($this->request->getIntegerParam('task_id'));
 
         if (! $task) {
             $this->notfound(true);
diff --git a/app/Controller/User.php b/app/Controller/User.php
index 504f4aed..c94c2c88 100644
--- a/app/Controller/User.php
+++ b/app/Controller/User.php
@@ -353,7 +353,7 @@ class User extends Base
         $this->response->html($this->layout('user_edit', array(
             'values' => $values,
             'errors' => $errors,
-            'projects' => $this->projectPermission->getAllowedProjects($user['id']),
+            'projects' => $this->projectPermission->filterProjects($this->project->getList(), $user['id']),
             'user' => $user,
         )));
     }
-- 
cgit v1.2.3