diff --git a/module/api/control.php b/module/api/control.php index fc2c08fd4d..e1e6094bbc 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -52,6 +52,12 @@ class api extends control $objectType = $this->objectType; $objectID = $this->objectID; $isFirstLoad = $libID ? false : true; + $lib = $this->doc->getLibById($libID); + if($objectType == 'nolink' and !$objectID and ($lib->product or $lib->project)) + { + $objectType = $lib->product ? 'product' : 'project'; + $objectID = $lib->product ? $lib->product : $lib->project; + } if($release) { diff --git a/module/api/view/apilist.html.php b/module/api/view/apilist.html.php index 897a1c6da9..75e50d6ebf 100644 --- a/module/api/view/apilist.html.php +++ b/module/api/view/apilist.html.php @@ -115,7 +115,7 @@
  • - lib}&moduleID=0&apiID={$api->id}&version=0&release=$release");?>" data-app="tab;?>"> + lib}&moduleID=0&apiID={$api->id}&version=0");?>" data-app="tab;?>"> method;?> path;?> title;?> diff --git a/module/doc/view/lefttree.html.php b/module/doc/view/lefttree.html.php index 8dac76c5cb..500cb18759 100644 --- a/module/doc/view/lefttree.html.php +++ b/module/doc/view/lefttree.html.php @@ -77,6 +77,7 @@ js::set('release', isset($release) ? $release : 0); js::set('versionLang', $lang->build->common); js::set('spaceType', $this->session->spaceType); js::set('rawModule', $this->app->rawModule); +js::set('rawMethod', $this->app->rawMethod); /* ObjectType and objectID used for other space. */ js::set('objectType', isset($type) ? $type : ''); @@ -474,7 +475,7 @@ $(function() if(!libID) libID = 0; if(!moduleID) moduleID = 0; linkParams = linkParams.replace('%s', 'libID=' + libID + '&moduleID=' + moduleID); - if(config.currentModule == 'api' && config.currentMethod == 'view') spaceType = 'api'; + if(rawModule == 'api' && rawMethod== 'view') spaceType = 'api'; if(spaceType != 'api' && rawModule == 'api') linkParams = 'objectID=' + objectID + '&' + linkParams; var moduleName = spaceType == 'api' ? 'api' : 'doc'; var methodName = '';