From d1c2928233230233a15aa0524c0dd5d1eb19ad5b Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Tue, 2 Aug 2022 01:04:58 +0000 Subject: [PATCH 1/3] * Fix bug #25879. --- module/common/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 4f68d398e7..86a2c48db1 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1966,7 +1966,7 @@ EOD; } } - $changes = array(); + $changes = array(); foreach($new as $key => $value) { if(is_object($value) or is_array($value)) continue; @@ -1983,6 +1983,7 @@ EOD; if(strtolower($key) == 'activateddate' and $value == '') continue; if(strtolower($key) == 'closeddate' and $value == '') continue; if(strtolower($key) == 'actualcloseddate' and $value == '') continue; + if(strtolower($key) == 'reviewedby' and $value == '') continue; if(isset($old->$key) and $value != stripslashes($old->$key)) { From 1527dbd7ce594e8bef72870dd245e7007f6309a8 Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Tue, 2 Aug 2022 06:20:15 +0000 Subject: [PATCH 2/3] * Fix bug 25879. --- module/story/model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/story/model.php b/module/story/model.php index 78e8a57dff..72373647cc 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -780,7 +780,7 @@ class storyModel extends model ->cleanFloat('estimate') ->setDefault('assignedDate', $oldStory->assignedDate) ->setDefault('lastEditedBy', $this->app->user->account) - ->setDefault('reviewedBy', '') + ->setDefault('reviewedBy', $oldStory->reviewedBy) ->setDefault('mailto', '') ->add('id', $storyID) ->add('lastEditedDate', $now) From c45499b4978a98bbfdc219e5ed3e2a0414905479 Mon Sep 17 00:00:00 2001 From: liuyongkai Date: Tue, 2 Aug 2022 06:33:56 +0000 Subject: [PATCH 3/3] * Fix bug 25879. --- module/common/model.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 86a2c48db1..040cb74887 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -1983,7 +1983,6 @@ EOD; if(strtolower($key) == 'activateddate' and $value == '') continue; if(strtolower($key) == 'closeddate' and $value == '') continue; if(strtolower($key) == 'actualcloseddate' and $value == '') continue; - if(strtolower($key) == 'reviewedby' and $value == '') continue; if(isset($old->$key) and $value != stripslashes($old->$key)) {