Merge branch 'sprint/fixbug_hufangzhou_16114' into 'master'

* Fix bug #16114, #16204.

See merge request easycorp/zentaopms!2415
This commit is contained in:
王怡栋
2022-03-22 01:17:53 +00:00
2 changed files with 2 additions and 2 deletions
+1 -1
View File
@@ -346,7 +346,7 @@ class apiModel extends model
}
if($version)
{
$fields = 'spec.*,api.id,api.product,api.lib,api.version,doc.name as libName,module.name as moduleName,api.editedBy,api.editedDate';
$fields = 'spec.*,api.id,api.product,api.lib,api.version,api.paramsExample,api.responseExample,doc.name as libName,module.name as moduleName,api.editedBy,api.editedDate';
}
else
{
+1 -1
View File
@@ -2378,7 +2378,7 @@ EOT;
if(common::hasPriv('doc', 'edit'))
{
$treeMenu[0] .= "<div class='tree-actions'>";
$treeMenu[0] .= html::a(helper::createLink('doc', 'edit', "docID={$doc->id}&comment=false&objectType=$type&objectID=$objectID&libID=$rootID"), "<i class='icon icon-edit'></i>", '', "title={$this->lang->doc->edit}");
$treeMenu[0] .= html::a(helper::createLink('doc', 'edit', "docID={$doc->id}&comment=false&objectType=$type&objectID=$objectID&libID=$rootID"), "<i class='icon icon-edit'></i>", '', "title={$this->lang->doc->edit} data-app='{$this->app->tab}'");
$treeMenu[0] .= '</div></div>';
}
}