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

Merge branch release/21.7.2 of zentao/zentaopms (#9686)

Browse Source
This commit is contained in:
朱金勇
2025-06-19 16:02:45 +08:00
committed by Gitfox
parent 8f61f6f969 08fb2bec46
commit 6975168373
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/test/lib/action.unittest.class.php
+1 -1
View File
@@ -828,7 +828,7 @@ class actionTest
public function renderChangesTest(string $objectType, int $historyID = 0): string
{
$histories = $this->objectModel->dao->select('*')->from(TABLE_HISTORY)->where('id')->eq($historyID)->fetchAll('id', false);
$content = $this->objectModel->renderChanges($objectType, $histories, true);
$content = $this->objectModel->renderChanges($objectType, 0, $histories);
$content = str_replace("\n", '', $content);
return $content;
}
module/action/test/model/renderchanges.php
+1 -1
View File
@@ -33,4 +33,4 @@ r($action->renderChangesTest('')) && p('') && e('0'); // 测试type为
r($action->renderChangesTest('bug', 1)) && p('') && e('修改了 <strong><i>解决方案</i></strong>，旧值为 "oldValue"，新值为 "newValue"。<br />'); // 测试bug解决方案历史记录
r($action->renderChangesTest('bug', 2)) && p('') && e('修改了 <strong><i>解决版本</i></strong>，旧值为 "oldValue"，新值为 "newValue"。<br />'); // 测试bug解决版本历史记录
r($action->renderChangesTest('bug', 3)) && p('') && e('修改了 <strong><i>解决日期</i></strong>，旧值为 "oldValue"，新值为 "newValue"。<br />'); // 测试bug解决日期历史记录
r($action->renderChangesTest('product', 4)) && p('') && e('修改了 <strong><i>状态</i></strong>，旧值为 "oldValue"，新值为 "newValue"。<br />'); // 测试产品状态历史记录
r($action->renderChangesTest('product', 4)) && p('') && e('修改了 <strong><i>状态</i></strong>，旧值为 "oldValue"，新值为 "newValue"。<br />'); // 测试产品状态历史记录