From 0f2a2b7bc323495111b38f927771dae32dc4120f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 19 Apr 2023 17:14:32 +0800 Subject: [PATCH] * Fixed the interface details style problem. --- module/action/lang/de.php | 2 +- module/action/lang/en.php | 2 +- module/action/lang/fr.php | 2 +- module/action/lang/zh-cn.php | 2 +- module/action/model.php | 2 +- module/api/control.php | 7 ++++--- module/common/lang/menu.php | 2 +- module/doc/view/lefttree.html.php | 1 - 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/module/action/lang/de.php b/module/action/lang/de.php index 0fbacca163..4ddd3fe327 100644 --- a/module/action/lang/de.php +++ b/module/action/lang/de.php @@ -769,7 +769,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; $lang->action->label->issue = 'Issue|issue|view|issueID=%s'; $lang->action->label->design = 'Design|design|view|designID=%s'; $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s'; -$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s'; +$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s'; $lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s'; $lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s'; diff --git a/module/action/lang/en.php b/module/action/lang/en.php index 1515919197..d20c814c5a 100755 --- a/module/action/lang/en.php +++ b/module/action/lang/en.php @@ -769,7 +769,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; $lang->action->label->issue = 'Issue|issue|view|issueID=%s'; $lang->action->label->design = 'Design|design|view|designID=%s'; $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s'; -$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s'; +$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s'; $lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s'; $lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s'; diff --git a/module/action/lang/fr.php b/module/action/lang/fr.php index 861af6fad9..c4c5e25b08 100644 --- a/module/action/lang/fr.php +++ b/module/action/lang/fr.php @@ -769,7 +769,7 @@ $lang->action->label->risk = 'Risk|risk|view|riskID=%s'; $lang->action->label->issue = 'Issue|issue|view|issueID=%s'; $lang->action->label->design = 'Design|design|view|designID=%s'; $lang->action->label->stakeholder = 'Stakeholder|stakeholder|view|userID=%s'; -$lang->action->label->api = 'Interface|api|index|libID=%s&moduleID=%s&apiID=%s'; +$lang->action->label->api = 'Interface|api|view|libID=%s&apiID=%s&moduleID=%s'; $lang->action->label->kanbanspace = 'Kanban Space|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = 'Kanban Region|kanban|view|kanbanID=%s'; $lang->action->label->kanban = 'Kanban|kanban|view|kanbanID=%s'; diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php index 579caa807f..54a285e643 100755 --- a/module/action/lang/zh-cn.php +++ b/module/action/lang/zh-cn.php @@ -770,7 +770,7 @@ $lang->action->label->risk = '风险|risk|view|riskID=%s'; $lang->action->label->issue = '问题|issue|view|issueID=%s'; $lang->action->label->design = '设计|design|view|designID=%s'; $lang->action->label->stakeholder = '干系人|stakeholder|view|userID=%s'; -$lang->action->label->api = '接口|api|index|libID=%s&moduleID=%s&apiID=%s'; +$lang->action->label->api = '接口|api|view|libID=%s&apiID=%s&moduleID=%s'; $lang->action->label->kanbanspace = '看板空间|kanban|space|browseType=%s'; $lang->action->label->kanbanregion = '看板区域|kanban|view|kanbanID=%s'; $lang->action->label->kanban = '看板|kanban|view|kanbanID=%s'; diff --git a/module/action/model.php b/module/action/model.php index 7509112254..28d84cc5d4 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -1621,7 +1621,7 @@ class actionModel extends model elseif($action->objectType == 'api') { $api = $this->dao->select('id,lib,module')->from(TABLE_API)->where('id')->eq($action->objectID)->fetch(); - $params = sprintf($vars, $api->lib, $api->module, $api->id); + $params = sprintf($vars, $api->lib, $api->id, $api->module); } elseif($action->objectType == 'branch') { diff --git a/module/api/control.php b/module/api/control.php index 7d674c14dd..3563dfd41a 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -148,14 +148,14 @@ class api extends control * @param int $libID * @param int $apiID * @param int $moduleID - * @param int $release * @param int $version + * @param int $release * @access public * @return void */ - public function view($libID, $apiID, $moduleID = 0, $release = 0, $version = 0) + public function view($libID, $apiID, $moduleID = 0, $version = 0, $release = 0) { - if(!strpos($this->server->http_referer, 'space') and !strpos($this->server->http_referer, 'index') and !strpos($this->server->http_referer, 'view')) setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true); + if(!strpos($this->server->http_referer, 'space') and !strpos($this->server->http_referer, 'api')) setCookie("docSpaceParam", '', $this->config->cookieLife, $this->config->webRoot, '', false, true); /* Get all api doc libraries. */ $libs = $this->doc->getApiLibs($libID); @@ -207,6 +207,7 @@ class api extends control $this->view->libs = $libs; $this->view->isRelease = $release > 0; $this->view->release = $release; + $this->view->version = $version; $this->view->libID = $libID; $this->view->apiID = $apiID; $this->view->moduleID = $moduleID; diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 30a2457346..66fec42df9 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -502,7 +502,7 @@ $lang->doc->menu->dashboard = array('link' => "{$lang->dashboard}|doc|index"); $lang->doc->menu->my = array('link' => "{$lang->doc->mySpace}|doc|mySpace|type=mine", 'alias' => 'myspace'); $lang->doc->menu->product = array('link' => "{$lang->doc->productSpace}|doc|productSpace|", 'alias' => 'productspace'); $lang->doc->menu->project = array('link' => "{$lang->doc->projectSpace}|doc|projectSpace|", 'alias' => 'projectspace'); -$lang->doc->menu->api = array('link' => "{$lang->doc->apiSpace}|api|index", 'alias' => '', 'exclude' => 'index,view'); +$lang->doc->menu->api = array('link' => "{$lang->doc->apiSpace}|api|index", 'alias' => '', 'exclude' => 'index'); $lang->doc->menu->custom = array('link' => "{$lang->doc->teamSpace}|doc|teamSpace|", 'alias' => 'teamspace'); $lang->doc->dividerMenu = ',product,'; diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 6ae0d68c24..5229ea45e7 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -256,7 +256,6 @@ $(function() 'ppt' : 'ppt', 'excel' : 'excel' }; - console.log(treeData) ele.tree( {