Merge pull request #1 from fguillot/master

Update from upstream

1 files changed, 10 insertions, 6 deletions

diff --git a/app/Api/Me.php b/app/Api/Me.php
index 2c332a8c..ccc809ed 100644
--- a/app/Api/Me.php
+++ b/app/Api/Me.php
@@ -14,13 +14,13 @@ class Me extends Base
 {
     public function getMe()
     {
-        return $this->session['user'];
+        return $this->sessionStorage->user;
     }
 
     public function getMyDashboard()
     {
         $user_id = $this->userSession->getId();
-        $projects = $this->project->getQueryColumnStats($this->projectPermission->getActiveMemberProjectIds($user_id))->findAll();
+        $projects = $this->project->getQueryColumnStats($this->projectPermission->getActiveProjectIds($user_id))->findAll();
         $tasks = $this->taskFinder->getUserQuery($user_id)->findAll();
 
         return array(
@@ -32,25 +32,29 @@ class Me extends Base
 
     public function getMyActivityStream()
     {
-        $project_ids = $this->projectPermission->getActiveMemberProjectIds($this->userSession->getId());
+        $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
         return $this->projectActivity->getProjects($project_ids, 100);
     }
 
     public function createMyPrivateProject($name, $description = null)
     {
+        if ($this->config->get('disable_private_project', 0) == 1) {
+            return false;
+        }
+
         $values = array(
             'name' => $name,
             'description' => $description,
             'is_private' => 1,
         );
 
-        list($valid, ) = $this->project->validateCreation($values);
+        list($valid, ) = $this->projectValidator->validateCreation($values);
         return $valid ? $this->project->create($values, $this->userSession->getId(), true) : false;
     }
 
     public function getMyProjectsList()
     {
-        return $this->projectPermission->getMemberProjects($this->userSession->getId());
+        return $this->projectUserRole->getProjectsByUser($this->userSession->getId());
     }
 
     public function getMyOverdueTasks()
@@ -60,7 +64,7 @@ class Me extends Base
 
     public function getMyProjects()
     {
-        $project_ids = $this->projectPermission->getActiveMemberProjectIds($this->userSession->getId());
+        $project_ids = $this->projectPermission->getActiveProjectIds($this->userSession->getId());
         $projects = $this->project->getAllByIds($project_ids);
 
         return $this->formatProjects($projects);