From e6191ee335dded46ba99be7642a3821d657c5de6 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Fri, 19 Jan 2024 11:09:09 +0800 Subject: [PATCH] * Adjust modal reload for task record hours. --- module/task/control.php | 2 +- module/task/zen.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/task/control.php b/module/task/control.php index e5886f0d3f..0ed2a2c8df 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -562,7 +562,7 @@ class task extends control /* The task status will be set to wait as the consumed effort is set to 0. */ if($task->consumed - $effort->consumed == 0) $this->action->create('task', $taskID, 'Adjusttasktowait'); - return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => true, 'closeModal' => true)); + return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => 'modal')); } /** diff --git a/module/task/zen.php b/module/task/zen.php index b436f05429..5aa991bfe1 100644 --- a/module/task/zen.php +++ b/module/task/zen.php @@ -1589,7 +1589,7 @@ class taskZen extends task return $response; } - $response['load'] = $from != 'edittask'; + $response['load'] = $this->app->rawMethod == 'recordworkhour' ? 'modal' : $from != 'edittask'; return $response; }