* adjust for showDeleted custom.
This commit is contained in:
@@ -75,7 +75,7 @@ class custom extends control
|
||||
}
|
||||
if($module == 'user' and $field == 'deleted')
|
||||
{
|
||||
$this->loadModel('user');
|
||||
$this->app->loadConfig('user');
|
||||
$this->view->showDeleted = isset($this->config->user->showDeleted) ? $this->config->user->showDeleted : '0';
|
||||
}
|
||||
|
||||
|
||||
@@ -1686,6 +1686,7 @@ class projectModel extends model
|
||||
public function getTeamMemberPairs($projectID, $params = '')
|
||||
{
|
||||
if(defined('TUTORIAL')) return $this->loadModel('tutorial')->getTeamMembersPairs();
|
||||
$this->app->loadConfig('user');
|
||||
$users = $this->dao->select('t1.account, t2.realname')->from(TABLE_TEAM)->alias('t1')
|
||||
->leftJoin(TABLE_USER)->alias('t2')->on('t1.account = t2.account')
|
||||
->where('t1.root')->eq((int)$projectID)
|
||||
|
||||
@@ -1428,7 +1428,7 @@ class taskModel extends model
|
||||
if($task->parent > 0) $task->parentName = $this->dao->findById($task->parent)->from(TABLE_TASK)->fetch('name');
|
||||
|
||||
$task->team = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($taskID)->andWhere('type')->eq('task')->orderBy('order')->fetchAll('account');
|
||||
foreach($children as $child) $child->team = isset($teams[$child->id]) ? $teams[$child->id] : array();
|
||||
foreach($children as $child) $child->team = array();
|
||||
|
||||
$task = $this->loadModel('file')->replaceImgURL($task, 'desc');
|
||||
if($setImgSize) $task->desc = $this->file->setImgSize($task->desc);
|
||||
|
||||
@@ -87,6 +87,7 @@ class userModel extends model
|
||||
$orderBy = strpos($params, 'first') !== false ? 'roleOrder DESC, account' : 'account';
|
||||
|
||||
/* Get raw records. */
|
||||
$this->app->loadConfig('user');
|
||||
$users = $this->dao->select($fields)->from(TABLE_USER)
|
||||
->where('1')
|
||||
->beginIF(strpos($params, 'nodeleted') !== false or empty($this->config->user->showDeleted))->andWhere('deleted')->eq('0')->fi()
|
||||
|
||||
Reference in New Issue
Block a user