Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* change method "getDataInJSON" of user model for new API.

Browse Source
This commit is contained in:
Catouse
2015-02-26 14:05:53 +08:00
parent 13e6b3d91b
commit 4b0d42c230
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/user/model.php
+3 -11
View File
@@ -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;
}