Merge branch 'sprint/180_songchenxuan_realname' into 'master'
Sprint/180 songchenxuan realname See merge request easycorp/zentaopms!1300
This commit is contained in:
@@ -1973,10 +1973,10 @@ class execution extends control
|
||||
foreach($plans as $plan) $allPlans += $plan;
|
||||
}
|
||||
|
||||
$userList = $this->dao->select('account, realname name, avatar')->from(TABLE_USER)->where('deleted')->eq(0)->fetchAll('account');
|
||||
$userList['closed']['account'] = 'Closed';
|
||||
$userList['closed']['name'] = 'Closed';
|
||||
$userList['closed']['avatar'] = '';
|
||||
$userList = $this->dao->select('account, realname, avatar')->from(TABLE_USER)->where('deleted')->eq(0)->fetchAll('account');
|
||||
$userList['closed']['account'] = 'Closed';
|
||||
$userList['closed']['realname'] = 'Closed';
|
||||
$userList['closed']['avatar'] = '';
|
||||
|
||||
$this->view->title = $this->lang->execution->kanban;
|
||||
$this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
|
||||
|
||||
Reference in New Issue
Block a user