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

Merge branch 'sprint/208_liumengyi_fixbug' into 'master'

Browse Source 
* Fix bug #24609, #24611.

See merge request easycorp/zentaopms!4281
This commit is contained in:
王怡栋
2022-06-30 08:56:01 +00:00
parent 87df303397 d65ba3736d
commit c62fb3f304
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+7
View File
@@ -2259,6 +2259,13 @@ class bug extends control
$bug->steps = str_replace(' ', ' ', $bug->steps);
}
$bug->openedDate = !helper::isZeroDate($bug->openedDate) ? $bug->openedDate : '';
$bug->assignedDate = !helper::isZeroDate($bug->assignedDate) ? $bug->assignedDate : '';
$bug->resolvedDate = !helper::isZeroDate($bug->resolvedDate) ? $bug->resolvedDate : '';
$bug->closedDate = !helper::isZeroDate($bug->closedDate) ? $bug->closedDate : '';
$bug->lastEditedDate = !helper::isZeroDate($bug->lastEditedDate) ? $bug->lastEditedDate : '';
$bug->deadline = !helper::isZeroDate($bug->deadline) ? $bug->deadline : '';
/* fill some field with useful value. */
$bug->product = !isset($products[$bug->product]) ? '' : $products[$bug->product] . "(#$bug->product)";
$bug->project = !isset($projects[$bug->project]) ? '' : $projects[$bug->project] . "(#$bug->project)";
module/testcase/control.php
+4
View File
@@ -1582,6 +1582,10 @@ class testcase extends control
$case->real = '';
$result = isset($results[$case->id]) ? $results[$case->id] : array();
$case->openedDate = !helper::isZeroDate($case->openedDate) ? $case->openedDate : '';
$case->lastEditedDate = !helper::isZeroDate($case->lastEditedDate) ? $case->lastEditedDate : '';
$case->lastRunDate = !helper::isZeroDate($case->lastRunDate) ? $case->lastRunDate : '';
$case->real = '';
if(!empty($result) and !isset($relatedSteps[$case->id]))
{