+
+
+
+
+
method;?>
+
path;?>
-
-

title;?>

-
desc;?>
- params['header']):?> -

api->header;?>

- - - - - - - - - - - params['header'] as $param):?> - - - - - - - - -
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
Stringapi->boolList[$param['required']];?>
- - params['query']):?> -

api->query;?>

- - - - - - - - - - - params['query'] as $param):?> - - - - - - - - -
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
Stringapi->boolList[$param['required']];?>
- - +
+

title;?>

+
desc;?>
+ params['header']):?> +

api->header;?>

+ + + + + + + + + + + params['header'] as $param):?> + + + + + + + + +
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
Stringapi->boolList[$param['required']];?>
+ + params['query']):?> +

api->query;?>

+ + + + + + + + + + + params['query'] as $param):?> + + + + + + + + +
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
Stringapi->boolList[$param['required']];?>
+ + '; - $field = ''; - for($i = 0; $i < $level; $i++) $field .= '  '. ($i == $level-1 ? '∟' : ' ') . '  '; - $field .= $data['field']; - $str .= '' . $field . ''; - $str .= '' . zget($typeList, $data['paramsType'], '') . ''; - $str .= '' . zget($lang->api->boolList, $data['required'], '') . ''; - $str .= '' . $data['desc'] . ''; - $str .= ''; - if(isset($data['children']) && count($data['children']) > 0) - { - $level++; - foreach($data['children'] as $item) $str .= parseTree($item, $typeList, $level); - } - return $str; - } - ?> - params['params']):?> -

api->params;?>

- - - - - - - - - - params['params'] as $item) echo parseTree($item, $typeList);?> -
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
- - paramsExample):?> -

api->paramsExample;?>

- 
paramsExample;?>
- - response):?> -

api->response;?>

- - - - - - - - - - - response as $item) echo parseTree($item, $typeList);?> - -
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
- - responseExample):?> -

api->responseExample;?>

- 
responseExample;?>
- -
+ $str = ''; + $field = ''; + for($i = 0; $i < $level; $i++) $field .= '  '. ($i == $level-1 ? '∟' : ' ') . '  '; + $field .= $data['field']; + $str .= '' . $field . ''; + $str .= '' . zget($typeList, $data['paramsType'], '') . ''; + $str .= '' . zget($lang->api->boolList, $data['required'], '') . ''; + $str .= '' . $data['desc'] . ''; + $str .= ''; + if(isset($data['children']) && count($data['children']) > 0) + { + $level++; + foreach($data['children'] as $item) $str .= parseTree($item, $typeList, $level); + } + return $str; + } + ?> + params['params']):?> +

api->params;?>

+ + + + + + + + + + params['params'] as $item) echo parseTree($item, $typeList);?> +
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
+ + paramsExample):?> +

api->paramsExample;?>

+ 
paramsExample;?>
+ + response):?> +

api->response;?>

+ + + + + + + + + + + response as $item) echo parseTree($item, $typeList);?> + +
api->req->name;?>api->req->type;?>api->req->required;?>api->req->desc;?>
+ + responseExample):?> +

api->responseExample;?>

+ 
responseExample;?>
+
diff --git a/module/doc/model.php b/module/doc/model.php index 0a0e4705c7..1504433d4f 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -19,7 +19,8 @@ class docModel extends model public $action; // api doc type - const DOC_TYPE_API = 'api'; + const DOC_TYPE_API = 'api'; + const DOC_TYPE_REST = 'restapi'; /** * Get library by id. @@ -2473,10 +2474,10 @@ class docModel extends model * @param array $moduleDocs * @param pointer $docID * @param int $moduleID - * @access private + * @access public * @return string */ - private function buildTree(&$treeMenu, $type, $objectID, $libID, $module, $moduleDocs, &$docID, $moduleID = 0) + public function buildTree(&$treeMenu, $type, $objectID, $libID, $module, $moduleDocs, &$docID, $moduleID = 0) { if(!isset($treeMenu[$module->id])) $treeMenu[$module->id] = ''; @@ -2490,9 +2491,13 @@ class docModel extends model if($type == static::DOC_TYPE_API) { $treeMenu[$module->id] .= 'id == $docID ? ' class="active"' : ' class="doc"') . '>'; - $treeMenu[$module->id] .= html::a(inlink('index', "libID=0&moduleID=0&apiID={$doc->id}"), "  " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'"); - + $treeMenu[$module->id] .= ''; + } + elseif($type == static::DOC_TYPE_REST) + { + $treeMenu[$module->id] .= 'id == $docID ? ' class="active"' : ' class="doc"') . '>'; + $treeMenu[$module->id] .= html::a(inlink('api', "type=restapi&apiID={$doc->id}"), "  " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'"); $treeMenu[$module->id] .= ''; } else @@ -2535,6 +2540,10 @@ class docModel extends model { $li = html::a(inlink('index', "libID=$libID&moduleID={$module->id}"), $module->name, '', "data-app='{$this->app->tab}' class='doc-title' title='{$module->name}'"); } + elseif($type == static::DOC_TYPE_REST) + { + $li = html::a('#', $module->name, '', "data-app='{$this->app->tab}' class='doc-title' title='{$module->name}'"); + } else { $moduleClass = common::hasPriv('tree', 'updateOrder') ? 'sort-module' : ''; @@ -2554,7 +2563,10 @@ class docModel extends model } if($treeMenu[$module->id]) { - $li .= '
    ' . $treeMenu[$module->id] . '
'; + $class = ''; + if($type == static::DOC_TYPE_REST) $class = 'class="menu-active-primary menu-hover-primary"'; + + $li .= "
    " . $treeMenu[$module->id] . '
'; } if(!isset($treeMenu[$module->parent])) $treeMenu[$module->parent] = '';