From 697ecffce708f729a2bc0469ce8e1c97f52433c3 Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Fri, 5 Aug 2022 03:29:29 +0000 Subject: [PATCH] * Fix bug #26002,25249 --- module/execution/model.php | 2 +- module/task/model.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index f338c645db..e0aee7f9cc 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -4392,7 +4392,7 @@ class executionModel extends model { if($execution->status != 'closed') { - echo strtotime($today) > strtotime($execution->end) ? '' . $execution->end . '' : '' . $execution->end . ''; + echo strtotime($today) > strtotime($execution->end) ? '' . $execution->end . '' : '' . $execution->end . ''; } else { diff --git a/module/task/model.php b/module/task/model.php index 2ff908f5e1..f2c6c63141 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -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) ? '' . $task->deadline . '' : '' . $task->deadline . ''; + $list .= strtotime($today) > strtotime($task->deadline) ? '' . $task->deadline . '' : '' . $task->deadline . ''; } else {