Merge branch 'app_zhengrunyu' into 'master'
*Fix api for user. See merge request easycorp/zentaopms!2457
This commit is contained in:
@@ -61,7 +61,7 @@ class userEntry extends Entry
|
||||
$info->profile = $this->format($profile, 'last:time,locked:time,birthday:date,join:date');
|
||||
$info->profile->role = array('code' => $info->profile->role, 'name' => $this->lang->user->roleList[$info->profile->role]);
|
||||
$info->profile->admin = strpos($this->app->company->admins, ",{$profile->account},") !== false;
|
||||
$info->profile->superReviewer = strpos(',' . trim(zget($this->config->story, 'superReviewers', ''), ',') . ',', ',' . $this->app->user->account . ',');
|
||||
$info->profile->superReviewer = isset($this->config->story) ? strpos(',' . trim(zget($this->config->story, 'superReviewers', ''), ',') . ',', ',' . $this->app->user->account . ',') : false;
|
||||
|
||||
if(!$fields) return $this->send(200, $info);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user