* Fix bug #17994.
This commit is contained in:
@@ -1649,13 +1649,12 @@ class task extends control
|
||||
* @access public
|
||||
* @return string
|
||||
*/
|
||||
public function ajaxGetUserTasks($userID = '', $id = '', $status = '', $appendID = 0)
|
||||
public function ajaxGetUserTasks($userID = '', $id = '', $status = 'wait,doing', $appendID = 0)
|
||||
{
|
||||
if($userID == '') $userID = $this->app->user->id;
|
||||
$user = $this->loadModel('user')->getById($userID, 'id');
|
||||
$account = $user->account;
|
||||
|
||||
$status = empty($status) ? 'wait,doing' : $status;
|
||||
$tasks = $this->task->getUserTaskPairs($account, $status, '', $appendID);
|
||||
$suspendedTasks = $this->task->getUserSuspendedTasks($account);
|
||||
foreach($tasks as $taskid => $task)
|
||||
|
||||
@@ -1032,11 +1032,11 @@ class testtaskModel extends model
|
||||
/**
|
||||
* Get testtask pairs of a user.
|
||||
*
|
||||
* @param string $account
|
||||
* @param int $limit
|
||||
* @param string $status all|wait|doing|done|blocked
|
||||
* @param array $skipProductIDList
|
||||
* @param array $skipExecutionIDList
|
||||
* @param string $account
|
||||
* @param int $limit
|
||||
* @param string status all|wait|doing|done|blocked
|
||||
* @param array $skipProductIDList
|
||||
* @param array $skipExecutionIDList
|
||||
* @access public
|
||||
* @return array
|
||||
*/
|
||||
|
||||
@@ -31,7 +31,7 @@ function loadList(type, id, defaultType, idvalue)
|
||||
|
||||
id = id ? id : '';
|
||||
var param = 'userID=' + userID + '&id=' + id;
|
||||
if(type == "task") param += '&status=';
|
||||
if(type == "task") param += '&status=wait,doing';
|
||||
if(type == defaultType && idvalue != 0) param += '&idvalue=' + idvalue;
|
||||
|
||||
if(moduleList.indexOf(type) !== -1)
|
||||
|
||||
Reference in New Issue
Block a user