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

* Fix bug #26002,25249

Browse Source
This commit is contained in:
liuyongkai
2022-08-05 03:29:29 +00:00
parent 8837c4c100
commit 697ecffce7
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+1 -1
View File
@@ -4392,7 +4392,7 @@ class executionModel extends model
{
if($execution->status != 'closed')
{
echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed" title="已延期">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
echo strtotime($today) > strtotime($execution->end) ? '<td class="delayed" title="' . $this->lang->execution->delayed . '">' . $execution->end . '</td>' : '<td>' . $execution->end . '</td>';
}
else
{
module/task/model.php
+2 -1
View File
@@ -3782,6 +3782,7 @@ class taskModel extends model
*/
public function buildNestedList($execution, $task, $isChild = false, $showmore = false, $users = array())
{
$this->app->loadLang('execution');
$today = helper::today();
$showmore = $showmore ? 'showmore' : '';
$trAttrs = "data-id='t$task->id'";
@@ -3812,7 +3813,7 @@ class taskModel extends model
{
if($task->status != 'done')
{
$list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed" title="已延期">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
$list .= strtotime($today) > strtotime($task->deadline) ? '<td class="delayed" ' . 'title="' . $this->lang->execution->delayed . '">' . $task->deadline . '</td>' : '<td>' . $task->deadline . '</td>';
}
else
{