From 3c9591c4fb100df2e3ed683a55a03d83ff468350 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Jun 2025 10:46:15 +0800 Subject: [PATCH 1/4] * [task#145417,done,1h] Adjust document version. --- module/doc/control.php | 2 +- module/doc/model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 86e6551d34..196eec4073 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -2317,7 +2317,7 @@ class doc extends control $doc->module = (int)$doc->module; $doc->privs = array('edit' => common::hasPriv('doc', 'edit', $doc) && $doc->acl == 'open'); $doc->editors = $this->doc->getEditors($docID); - $doc->draft = $this->doc->getDraft($docID); + $doc->draft = $doc->status == 'draft' ? $this->doc->getDraft($docID, $version) : null; $lib = $this->doc->getLibByID((int)$doc->lib); $objectType = $lib->type; diff --git a/module/doc/model.php b/module/doc/model.php index 8fd918613d..c2e1fbc4d6 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1160,9 +1160,9 @@ class docModel extends model * @access public * @return ?object */ - public function getDraft(int $docID): ?object + public function getDraft(int $docID, int $version): ?object { - return $this->getContent($docID, 0); + return $this->getContent($docID, $version); } /** From ebd7d2d48057581c1640b78c4623782dc9ff4fe2 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Jun 2025 11:03:30 +0800 Subject: [PATCH 2/4] * [task#145417,done,0.5h] Remove getDraft function. --- module/doc/control.php | 2 +- module/doc/model.php | 13 ------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/module/doc/control.php b/module/doc/control.php index 196eec4073..1d211fa4be 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -2317,7 +2317,7 @@ class doc extends control $doc->module = (int)$doc->module; $doc->privs = array('edit' => common::hasPriv('doc', 'edit', $doc) && $doc->acl == 'open'); $doc->editors = $this->doc->getEditors($docID); - $doc->draft = $doc->status == 'draft' ? $this->doc->getDraft($docID, $version) : null; + $doc->draft = $doc->status == 'draft' ? $this->doc->getContent($docID, $version) : null; $lib = $this->doc->getLibByID((int)$doc->lib); $objectType = $lib->type; diff --git a/module/doc/model.php b/module/doc/model.php index c2e1fbc4d6..6c77317352 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1152,19 +1152,6 @@ class docModel extends model return null; } - /** - * 获取文档草稿。 - * Get doc draft. - * - * @param int $docID 文档ID - * @access public - * @return ?object - */ - public function getDraft(int $docID, int $version): ?object - { - return $this->getContent($docID, $version); - } - /** * 处理文档数据。 * Process doc data. From b8fba7bbb4e39b644ba62bf6decab575a9d905bd Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Jun 2025 13:08:06 +0800 Subject: [PATCH 3/4] * [task#145417,done,0.5h] Add getcontent test. --- module/doc/test/lib/doc.unittest.class.php | 14 ++++++++ module/doc/test/model/getcontent.php | 38 ++++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100755 module/doc/test/model/getcontent.php diff --git a/module/doc/test/lib/doc.unittest.class.php b/module/doc/test/lib/doc.unittest.class.php index 2e6cdec7ca..f812c4416a 100644 --- a/module/doc/test/lib/doc.unittest.class.php +++ b/module/doc/test/lib/doc.unittest.class.php @@ -1883,4 +1883,18 @@ class docTest return $doc; } + + /** + * 获取文档内容。 + * Get document content test. + * + * @param int $docID + * @param int $version + * @access public + * @return object|null + */ + public function getContentTest(int $docID, int $version): object|null + { + return $this->objectModel->getContent($docID, $version); + } } diff --git a/module/doc/test/model/getcontent.php b/module/doc/test/model/getcontent.php new file mode 100755 index 0000000000..b0f1e0920d --- /dev/null +++ b/module/doc/test/model/getcontent.php @@ -0,0 +1,38 @@ +#!/usr/bin/env php +getDocs(); +timeout=0 +cid=1 + +- 获取docID=1、版本为1的文档内容 + - 属性doc @1 + - 属性version @1 + - 属性title @文档标题1 +- 获取docID=2、版本为1的文档内容 + - 属性doc @2 + - 属性version @1 + - 属性title @文档标题2 +- 获取docID=1、版本为2的文档内容为空 @0 +- 获取docID=2、版本为2的文档内容为空 @0 +- 获取不存在的文档内容 @0 + +*/ + +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/lib/doc.unittest.class.php'; + +zenData('doc')->loadYaml('doc')->gen(5); +zenData('doccontent')->loadYaml('doccontent')->gen(5); + +$docIDList = array('1', '2', '6'); +$versionList = array('1', '2'); + +$docTester = new docTest(); +r($docTester->getContentTest($docIDList[0], $versionList[0])) && p('doc,version,title') && e('1,1,文档标题1'); // 获取docID=1、版本为1的文档内容 +r($docTester->getContentTest($docIDList[1], $versionList[0])) && p('doc,version,title') && e('2,1,文档标题2'); // 获取docID=2、版本为1的文档内容 +r($docTester->getContentTest($docIDList[0], $versionList[1])) && p() && e(0); // 获取docID=1、版本为2的文档内容为空 +r($docTester->getContentTest($docIDList[1], $versionList[1])) && p() && e(0); // 获取docID=2、版本为2的文档内容为空 +r($docTester->getContentTest($docIDList[2], $versionList[0])) && p() && e(0); // 获取不存在的文档内容 \ No newline at end of file From 32ce0ca7f71e67dcd6505c74746fb3a5eb1d8441 Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 19 Jun 2025 13:11:51 +0800 Subject: [PATCH 4/4] * [task#145417,done,0.1h] Rename test name. --- module/doc/test/model/getcontent.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/doc/test/model/getcontent.php b/module/doc/test/model/getcontent.php index b0f1e0920d..b8fe4bb7ae 100755 --- a/module/doc/test/model/getcontent.php +++ b/module/doc/test/model/getcontent.php @@ -3,7 +3,7 @@ /** -title=测试 docModel->getDocs(); +title=测试 docModel->getContent(); timeout=0 cid=1