From 4bc08301f8d89e0e252e01b0da858af29174f317 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=8D=8E=E4=BC=9F?= <sunhuawei@easycorp.ltd>
Date: Tue, 17 May 2022 10:40:11 +0800
Subject: [PATCH] *Fix bug #22375

---
 module/task/js/edit.js         | 2 +-
 module/task/model.php          | 1 +
 module/task/view/edit.html.php | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index 92971548ad..c8c8586921 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -162,7 +162,7 @@ $('#confirmButton').click(function()
     var memberCount   = '';
     var assignedTo    = '';
     var totalEstimate = 0;
-    var totalConsumed = 0;
+    var totalConsumed = oldConsumed;
     var totalLeft     = 0;
     $('select[name^=team]').each(function()
     {
diff --git a/module/task/model.php b/module/task/model.php
index b1d739e7af..f04071e1dc 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -818,6 +818,7 @@ class taskModel extends model
                 $currentTask->consumed += (float)$member->consumed;
                 $currentTask->left     += (float)$member->left;
             }
+            $currentTask->consumed += (float)$oldTask->consumed;
 
             if(!empty($task))
             {
diff --git a/module/task/view/edit.html.php b/module/task/view/edit.html.php
index 86c852d0c3..8846d49488 100644
--- a/module/task/view/edit.html.php
+++ b/module/task/view/edit.html.php
@@ -17,6 +17,7 @@
 <?php js::set('oldStoryID', $task->story);?>
 <?php js::set('oldAssignedTo', $task->assignedTo);?>
 <?php js::set('oldExecutionID', $task->execution);?>
+<?php js::set('oldConsumed', $task->consumed);?>
 <?php js::set('confirmChangeExecution', $lang->task->confirmChangeExecution);?>
 <?php js::set('changeExecutionConfirmed', false);?>
 <?php js::set('newRowCount', count($task->team) < 6 ? 6 - count($task->team) : 1);?>