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

Merge branch release/21.7.8 of zentao/zentaopms (#12885)

Browse Source
This commit is contained in:
刘刚
2025-12-18 17:27:44 +08:00
committed by Gitfox
parent dc55d594d5 80cb8db73d
commit 271c781585
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/zai/model.php
+6 -5
View File
@@ -656,7 +656,8 @@ class zaiModel extends model
}
elseif($objectType === 'doc')
{
$doc = $this->loadModel('doc')->getByID($objectID);
$api = isset($attrs['docType']) && $attrs['docType'] === 'api';
$doc = $this->loadModel($api ? 'api' : 'doc')->getByID($objectID);
$canView = $this->loadModel('doc')->checkPrivDoc($doc);
}
@@ -1463,7 +1464,7 @@ class zaiModel extends model
$app->loadLang('doc');
$lang = $app->lang;
if(isset($doc->protocol))
if(isset($doc->protocol) || !empty($doc->api))
{
$app->loadLang('api');
$markdown = array('id' => $doc->id, 'title' => "{$lang->doc->common} #$doc->id $doc->title");
@@ -1531,7 +1532,7 @@ class zaiModel extends model
if(!empty($doc->paramsExample))
{
$content[] = "\n## {$app->lang->api->paramsExample}\n";
$content[] = "```json\n{$doc->paramsExample}\n```";
$content[] = "```json\n" . htmlspecialchars_decode($doc->paramsExample) . "\n```";
}
if(!empty($doc->response))
{
@@ -1551,14 +1552,14 @@ class zaiModel extends model
if(!empty($doc->responseExample))
{
$content[] = "\n## {$app->lang->api->responseExample}\n";
$content[] = "```json\n{$doc->responseExample}\n```";
$content[] = "```json\n" . htmlspecialchars_decode($doc->responseExample) . "\n```";
}
$content[] = "\n## {$app->lang->api->desc}\n";
$content[] = strip_tags($doc->desc) . "\n";
$markdown['content'] = implode("\n", $content);
$markdown['attrs'] = array('product' => $doc->product, 'lib' => $doc->lib, 'module' => $doc->module, 'version' => $doc->version);
$markdown['attrs'] = array('product' => $doc->product, 'lib' => $doc->lib, 'module' => $doc->module, 'version' => $doc->version, 'docType' => 'api');
}
else
{