php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-08-18 01:07:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

ensure apidoc works with relative paths

Browse Source
This commit is contained in:
Carsten Brandt
2014-11-17 22:34:37 +01:00
parent a92a4179e4
commit b809f93b69
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
extensions/apidoc/commands/ApiController.php
View File

@ -51,11 +51,11 @@ class ApiController extends BaseController
} else { } else {
$guideUrl = './'; $guideUrl = './';
$renderer->guideUrl = $targetDir; $renderer->guideUrl = $targetDir;
} if (file_exists($renderer->generateGuideUrl('README.md'))) {
if (file_exists($renderer->generateGuideUrl('README.md'))) { $renderer->guideUrl = $guideUrl;
$renderer->guideUrl = $guideUrl; } else {
} else { $renderer->guideUrl = null;
$renderer->guideUrl = null; }
} }
// search for files to process // search for files to process

10
extensions/apidoc/commands/GuideController.php
View File

@ -47,8 +47,14 @@ class GuideController extends BaseController
// setup reference to apidoc // setup reference to apidoc
if ($this->apiDocs !== null) { if ($this->apiDocs !== null) {
$renderer->apiUrl = $this->apiDocs; $path = $this->apiDocs;
$renderer->apiContext = $this->loadContext($this->apiDocs); $renderer->apiUrl = $path;
// use relative paths relative to targetDir
if (strncmp($path, '.', 1) === 0) {
$renderer->apiContext = $this->loadContext("$targetDir/$path");
} else {
$renderer->apiContext = $this->loadContext($path);
}
} elseif (file_exists($targetDir . '/cache/apidoc.data')) { } elseif (file_exists($targetDir . '/cache/apidoc.data')) {
$renderer->apiUrl = './'; $renderer->apiUrl = './';
$renderer->apiContext = $this->loadContext($targetDir); $renderer->apiContext = $this->loadContext($targetDir);