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

* Finish task #45157.

Browse Source
This commit is contained in:
liumengyi
2021-11-29 10:37:56 +08:00
parent 2cfb89f727
commit 41d073f19d
2 changed files with 6 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
module/block/control.php
View File

@@ -598,14 +598,7 @@ class block extends control
unset($todos[$key]);
continue;
}
foreach($tasks as $task)
{
if($todo->type == 'task' and $todo->idvalue == $task->id)
{
unset($todos[$key]);
break;
}
}
if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]);
}
$this->view->todos = $todos;
@@ -1740,13 +1733,10 @@ class block extends control
unset($objects[$key]);
continue;
}
foreach($tasks as $task)
if($todo->type == 'task' and isset($tasks[$todo->idvalue]))
{
if($todo->type == 'task' and $todo->idvalue == $task->id)
{
unset($objects[$key]);
break;
}
unset($objects[$key]);
continue;
}
$todo->begin = date::formatTime($todo->begin);

14
module/my/control.php
View File

@@ -148,18 +148,8 @@ class my extends control
$sort = $this->loadModel('common')->appendOrder($orderBy);
$todos = $this->loadModel('todo')->getList($type, $account, $status, 0, $pager, $sort);
$tasks = $this->loadModel('task')->getUserSuspendedTasks($account);
foreach($todos as $key => $todo)
{
foreach($tasks as $task)
{
if($todo->type == 'task' and $todo->idvalue = $task->id)
{
unset($todos[$key]);
break;
}
}
}
$tasks = $this->loadModel('task')->getUserSuspendedTasks($account);
foreach($todos as $key => $todo) if($todo->type == 'task' and isset($tasks[$todo->idvalue])) unset($todos[$key]);
$pager->recTotal = count($todos);