From 4b0d42c23029295543f9ca494c857d3ec3da4147 Mon Sep 17 00:00:00 2001
From: Catouse <catouse@gmail.com>
Date: Thu, 26 Feb 2015 14:05:53 +0800
Subject: [PATCH] * change method "getDataInJSON" of user model for new API.

---
 module/user/model.php | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/module/user/model.php b/module/user/model.php
index 5b36374f0e..cd6554dcfd 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -786,8 +786,8 @@ class userModel extends model
      */
     public function getDataInJSON($user)
     {
-        $data = array();
-        $data['user'] = new stdclass();
+        $data                   = array();
+        $data['user']           = new stdclass();
         $data['user']->id       = $user->id;
         $data['user']->account  = $user->account;
         $data['user']->email    = $user->email;
@@ -795,15 +795,7 @@ class userModel extends model
         $data['user']->gender   = $user->gender;
         $data['user']->dept     = $user->dept;
         $data['user']->role     = $user->role;
-
-        $this->app->loadLang('todo');
-        $this->app->loadLang('task');
-        $this->app->loadLang('bug');
-        $this->app->loadLang('story');
-        $data['todoStatus']  = $this->lang->todo->statusList;
-        $data['taskStatus']  = $this->lang->task->statusList;
-        $data['bugStatus']   = $this->lang->bug->statusList;
-        $data['storyStatus'] = $this->lang->story->statusList;
+        $data['user']->company  = $this->app->company->name;
 
         return $data;
     }