From 21ffc5532a151345689a575805894dd030fdb4e1 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Tue, 17 Oct 2023 17:16:03 +0800 Subject: [PATCH] * Fixed errors of the struct form. --- module/api/config/dtable.php | 18 ++--- module/api/control.php | 18 ++--- module/api/lang/de.php | 105 +++++++++++++++--------------- module/api/lang/en.php | 105 +++++++++++++++--------------- module/api/lang/fr.php | 105 +++++++++++++++--------------- module/api/lang/zh-cn.php | 105 +++++++++++++++--------------- module/api/model.php | 1 + module/api/ui/create.html.php | 21 ++++-- module/api/ui/editstruct.html.php | 14 +++- module/api/ui/releases.html.php | 2 +- 10 files changed, 255 insertions(+), 239 deletions(-) diff --git a/module/api/config/dtable.php b/module/api/config/dtable.php index efd679d312..1e5d1737b1 100644 --- a/module/api/config/dtable.php +++ b/module/api/config/dtable.php @@ -25,7 +25,7 @@ $config->api->dtable->struct->fieldList['name']['sortType'] = false; $config->api->dtable->struct->fieldList['addedName']['title'] = $lang->api->addedBy; $config->api->dtable->struct->fieldList['addedName']['type'] = 'user'; -$config->api->dtable->struct->fieldList['addedName']['name'] = 'addedName'; +$config->api->dtable->struct->fieldList['addedName']['name'] = 'addedBy'; $config->api->dtable->struct->fieldList['addedDate']['title'] = $lang->api->structAddedDate; $config->api->dtable->struct->fieldList['addedDate']['type'] = 'date'; @@ -39,12 +39,12 @@ $config->api->dtable->struct->fieldList['actions']['fixed'] = 'right'; $config->api->dtable->struct->fieldList['actions']['name'] = 'actions'; $config->api->dtable->struct->fieldList['actions']['menu'] = array('editStruct', 'deleteStruct'); -$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['icon'] = 'edit'; -$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['hint'] = $lang->api->editStruct; -$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['url'] = helper::createLink('api', 'editStruct', 'lib={lib}&id={id}'); -$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['order'] = 5; +$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['icon'] = 'edit'; +$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['hint'] = $lang->api->editStruct; +$config->api->dtable->struct->fieldList['actions']['list']['editStruct']['url'] = helper::createLink('api', 'editStruct', 'lib={lib}&id={id}'); -$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['icon'] = 'trash'; -$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['hint'] = $lang->api->deleteStruct; -$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['url'] = helper::createLink('api', 'deleteStruct', 'lib={lib}&id={id}'); -$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['order'] = 5; +$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['icon'] = 'trash'; +$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['hint'] = $lang->api->deleteStruct; +$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['url'] = helper::createLink('api', 'deleteStruct', 'lib={lib}&id={id}'); +$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['className'] = 'ajax-submit'; +$config->api->dtable->struct->fieldList['actions']['list']['deleteStruct']['data-confirm'] = $lang->api->confirmDeleteStruct; diff --git a/module/api/control.php b/module/api/control.php index 82197c7b43..7e22526c07 100755 --- a/module/api/control.php +++ b/module/api/control.php @@ -348,6 +348,7 @@ class api extends control $this->view->orderBy = $orderBy; $this->view->title = $this->lang->api->struct; $this->view->pager = $pager; + $this->view->users = $this->loadModel('user')->getPairs('noclosed,noletter'); $this->display(); } @@ -371,6 +372,7 @@ class api extends control ->add('addedBy', $this->app->user->account) ->add('addedDate', helper::now()) ->skipSpecial('attribute') + ->stripTags($this->config->api->editor->createstruct['id'], $this->config->allowedTags) ->remove('undefined') ->get(); @@ -440,22 +442,14 @@ class api extends control * * @param int $libID * @param int $structID - * @param string $confirm * @access public * @return void */ - public function deleteStruct($libID, $structID = 0, $confirm = 'no') + public function deleteStruct($libID, $structID = 0) { - if($confirm == 'no') - { - return print(js::confirm($this->lang->custom->notice->confirmDelete, $this->createLink('api', 'deleteStruct', "libID=$libID&structID=$structID&confirm=yes"), '')); - } - else - { - $this->api->delete(TABLE_APISTRUCT, $structID); - if(dao::isError()) return $this->sendError(dao::getError()); - return print(js::locate(inlink('struct', "libID=$libID"), 'parent')); - } + $this->api->delete(TABLE_APISTRUCT, $structID); + if(dao::isError()) return $this->sendError(dao::getError()); + return $this->sendSuccess(array('load' => inlink('struct', "libID=$libID"))); } /** diff --git a/module/api/lang/de.php b/module/api/lang/de.php index 46b9909f9f..b644064c97 100644 --- a/module/api/lang/de.php +++ b/module/api/lang/de.php @@ -14,58 +14,59 @@ $lang->api->getModel = 'Super Model API'; $lang->api->sql = 'SQL Query API'; $lang->api->manage = 'API management'; -$lang->api->index = 'API Space'; -$lang->api->editLib = 'Edit'; -$lang->api->releases = 'Release'; -$lang->api->deleteRelease = 'Delete Release'; -$lang->api->deleteLib = 'Delete API Doc'; -$lang->api->createRelease = 'Publish'; -$lang->api->createLib = 'Create API Library'; -$lang->api->createApi = 'Create API Document'; -$lang->api->createAB = 'Create'; -$lang->api->createDemo = 'Import ZenTao Library'; -$lang->api->edit = 'Edit'; -$lang->api->delete = 'Delete'; -$lang->api->position = 'Position'; -$lang->api->startLine = "%s,%s"; -$lang->api->desc = 'Beschreibung'; -$lang->api->debug = 'Debug'; -$lang->api->submit = 'Übermitteln'; -$lang->api->url = 'Request URL'; -$lang->api->result = 'Ergebnisse'; -$lang->api->status = 'Status'; -$lang->api->data = 'Daten'; -$lang->api->noParam = 'Keine Parameter erforderlich bei GET Debug'; -$lang->api->noModule = 'No directory in the API library. Please add the directory first'; -$lang->api->post = 'Auf Seiten Liste beziehen bei POST Debug'; -$lang->api->noUniqueName = 'The API library name exists.'; -$lang->api->noUniqueVersion = 'The version exists.'; -$lang->api->createStruct = 'Create Data Structure'; -$lang->api->editStruct = 'Edit Data Structure'; -$lang->api->deleteStruct = 'Delete Data Structure'; -$lang->api->create = 'Create API'; -$lang->api->title = 'Name'; -$lang->api->pageTitle = 'API Library'; -$lang->api->module = 'Directory'; -$lang->api->apiDoc = 'API'; -$lang->api->manageType = 'Manage Directory'; -$lang->api->managePublish = 'Manage Version'; -$lang->api->doing = 'Doing'; -$lang->api->done = 'Done'; -$lang->api->basicInfo = 'Basic Information'; -$lang->api->apiDesc = 'Description'; -$lang->api->confirmDelete = "Do you want to delete this API?"; -$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; -$lang->api->filterStruct = "use struct"; -$lang->api->defaultVersion = "Current Version"; -$lang->api->zentaoAPI = "Zentao API v1"; -$lang->api->search = "Search"; -$lang->api->allLibs = "AllLibs"; -$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; -$lang->api->addCatalog = 'Add Catalog'; -$lang->api->editCatalog = 'Edit Catalog'; -$lang->api->sortCatalog = 'Catalog Sorting'; -$lang->api->deleteCatalog = 'Delete Catalog'; +$lang->api->index = 'API Space'; +$lang->api->editLib = 'Edit'; +$lang->api->releases = 'Release'; +$lang->api->deleteRelease = 'Delete Release'; +$lang->api->deleteLib = 'Delete API Doc'; +$lang->api->createRelease = 'Publish'; +$lang->api->createLib = 'Create API Library'; +$lang->api->createApi = 'Create API Document'; +$lang->api->createAB = 'Create'; +$lang->api->createDemo = 'Import ZenTao Library'; +$lang->api->edit = 'Edit'; +$lang->api->delete = 'Delete'; +$lang->api->position = 'Position'; +$lang->api->startLine = "%s,%s"; +$lang->api->desc = 'Beschreibung'; +$lang->api->debug = 'Debug'; +$lang->api->submit = 'Übermitteln'; +$lang->api->url = 'Request URL'; +$lang->api->result = 'Ergebnisse'; +$lang->api->status = 'Status'; +$lang->api->data = 'Daten'; +$lang->api->noParam = 'Keine Parameter erforderlich bei GET Debug'; +$lang->api->noModule = 'No directory in the API library. Please add the directory first'; +$lang->api->post = 'Auf Seiten Liste beziehen bei POST Debug'; +$lang->api->noUniqueName = 'The API library name exists.'; +$lang->api->noUniqueVersion = 'The version exists.'; +$lang->api->createStruct = 'Create Data Structure'; +$lang->api->editStruct = 'Edit Data Structure'; +$lang->api->deleteStruct = 'Delete Data Structure'; +$lang->api->create = 'Create API'; +$lang->api->title = 'Name'; +$lang->api->pageTitle = 'API Library'; +$lang->api->module = 'Directory'; +$lang->api->apiDoc = 'API'; +$lang->api->manageType = 'Manage Directory'; +$lang->api->managePublish = 'Manage Version'; +$lang->api->doing = 'Doing'; +$lang->api->done = 'Done'; +$lang->api->basicInfo = 'Basic Information'; +$lang->api->apiDesc = 'Description'; +$lang->api->confirmDelete = "Do you want to delete this API?"; +$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; +$lang->api->confirmDeleteStruct = "Do you want to delete this data struct?"; +$lang->api->filterStruct = "use struct"; +$lang->api->defaultVersion = "Current Version"; +$lang->api->zentaoAPI = "Zentao API v1"; +$lang->api->search = "Search"; +$lang->api->allLibs = "AllLibs"; +$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; +$lang->api->addCatalog = 'Add Catalog'; +$lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; +$lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ $lang->api->whiteList = 'Whitelist'; diff --git a/module/api/lang/en.php b/module/api/lang/en.php index 49a0e785d0..b542b34748 100644 --- a/module/api/lang/en.php +++ b/module/api/lang/en.php @@ -14,58 +14,59 @@ $lang->api->getModel = 'Super Model API'; $lang->api->sql = 'SQL Query API'; $lang->api->manage = 'API management'; -$lang->api->index = 'API Space'; -$lang->api->editLib = 'Edit'; -$lang->api->releases = 'Release'; -$lang->api->deleteRelease = 'Delete Release'; -$lang->api->deleteLib = 'Delete API Doc'; -$lang->api->createRelease = 'Publish'; -$lang->api->createLib = 'Create API Library'; -$lang->api->createApi = 'Create API Document'; -$lang->api->createAB = 'Create'; -$lang->api->createDemo = 'Import ZenTao Library'; -$lang->api->edit = 'Edit'; -$lang->api->delete = 'Delete'; -$lang->api->position = 'Position'; -$lang->api->startLine = "%s,%s"; -$lang->api->desc = 'Description'; -$lang->api->debug = 'Debug'; -$lang->api->submit = 'Submit'; -$lang->api->url = 'URL'; -$lang->api->result = 'Result'; -$lang->api->status = 'Status'; -$lang->api->data = 'Content'; -$lang->api->noParam = 'Get debugging does not require input parameters，'; -$lang->api->noModule = 'No directory in the API library. Please add the directory first'; -$lang->api->post = 'Please refer to the page form for post debugging'; -$lang->api->noUniqueName = 'The API library name exists.'; -$lang->api->noUniqueVersion = 'The version exists.'; -$lang->api->createStruct = 'Create Data Structure'; -$lang->api->editStruct = 'Edit Data Structure'; -$lang->api->deleteStruct = 'Delete Data Structure'; -$lang->api->create = 'Create API'; -$lang->api->title = 'Name'; -$lang->api->pageTitle = 'API Library'; -$lang->api->module = 'Directory'; -$lang->api->apiDoc = 'API'; -$lang->api->manageType = 'Manage Directory'; -$lang->api->managePublish = 'Manage Version'; -$lang->api->doing = 'Doing'; -$lang->api->done = 'Done'; -$lang->api->basicInfo = 'Basic Information'; -$lang->api->apiDesc = 'Description'; -$lang->api->confirmDelete = "Do you want to delete this API?"; -$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; -$lang->api->filterStruct = "use struct"; -$lang->api->defaultVersion = "Current Version"; -$lang->api->zentaoAPI = "Zentao API v1"; -$lang->api->search = "Search"; -$lang->api->allLibs = "AllLibs"; -$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; -$lang->api->addCatalog = 'Add Catalog'; -$lang->api->editCatalog = 'Edit Catalog'; -$lang->api->sortCatalog = 'Catalog Sorting'; -$lang->api->deleteCatalog = 'Delete Catalog'; +$lang->api->index = 'API Space'; +$lang->api->editLib = 'Edit'; +$lang->api->releases = 'Release'; +$lang->api->deleteRelease = 'Delete Release'; +$lang->api->deleteLib = 'Delete API Doc'; +$lang->api->createRelease = 'Publish'; +$lang->api->createLib = 'Create API Library'; +$lang->api->createApi = 'Create API Document'; +$lang->api->createAB = 'Create'; +$lang->api->createDemo = 'Import ZenTao Library'; +$lang->api->edit = 'Edit'; +$lang->api->delete = 'Delete'; +$lang->api->position = 'Position'; +$lang->api->startLine = "%s,%s"; +$lang->api->desc = 'Description'; +$lang->api->debug = 'Debug'; +$lang->api->submit = 'Submit'; +$lang->api->url = 'URL'; +$lang->api->result = 'Result'; +$lang->api->status = 'Status'; +$lang->api->data = 'Content'; +$lang->api->noParam = 'Get debugging does not require input parameters，'; +$lang->api->noModule = 'No directory in the API library. Please add the directory first'; +$lang->api->post = 'Please refer to the page form for post debugging'; +$lang->api->noUniqueName = 'The API library name exists.'; +$lang->api->noUniqueVersion = 'The version exists.'; +$lang->api->createStruct = 'Create Data Structure'; +$lang->api->editStruct = 'Edit Data Structure'; +$lang->api->deleteStruct = 'Delete Data Structure'; +$lang->api->create = 'Create API'; +$lang->api->title = 'Name'; +$lang->api->pageTitle = 'API Library'; +$lang->api->module = 'Directory'; +$lang->api->apiDoc = 'API'; +$lang->api->manageType = 'Manage Directory'; +$lang->api->managePublish = 'Manage Version'; +$lang->api->doing = 'Doing'; +$lang->api->done = 'Done'; +$lang->api->basicInfo = 'Basic Information'; +$lang->api->apiDesc = 'Description'; +$lang->api->confirmDelete = "Do you want to delete this API?"; +$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; +$lang->api->confirmDeleteStruct = "Do you want to delete this data struct?"; +$lang->api->filterStruct = "use struct"; +$lang->api->defaultVersion = "Current Version"; +$lang->api->zentaoAPI = "Zentao API v1"; +$lang->api->search = "Search"; +$lang->api->allLibs = "AllLibs"; +$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; +$lang->api->addCatalog = 'Add Catalog'; +$lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; +$lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ $lang->api->whiteList = 'Whitelist'; diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php index dd161b1416..da64da73a0 100644 --- a/module/api/lang/fr.php +++ b/module/api/lang/fr.php @@ -14,58 +14,59 @@ $lang->api->getModel = 'Super Model API'; $lang->api->sql = 'SQL Query API'; $lang->api->manage = 'API management'; -$lang->api->index = 'API Space'; -$lang->api->editLib = 'Edit'; -$lang->api->releases = 'Release'; -$lang->api->deleteRelease = 'Delete Release'; -$lang->api->deleteLib = 'Delete API Doc'; -$lang->api->createRelease = 'Publish'; -$lang->api->createLib = 'Create API Library'; -$lang->api->createApi = 'Create API Document'; -$lang->api->createAB = 'Create'; -$lang->api->createDemo = 'Import ZenTao Library'; -$lang->api->edit = 'Edit'; -$lang->api->delete = 'Delete'; -$lang->api->position = 'Position'; -$lang->api->startLine = "%s,%s"; -$lang->api->desc = 'Description'; -$lang->api->debug = 'Debug'; -$lang->api->submit = 'Soumission'; -$lang->api->url = 'Request URL'; -$lang->api->result = 'Résultats'; -$lang->api->status = 'Statut'; -$lang->api->data = 'Données'; -$lang->api->noParam = "Aucun paramètre n'est requis si GET Debug"; -$lang->api->noModule = 'No directory in the API library. Please add the directory first'; -$lang->api->post = 'Se référer à la liste si POST Debug'; -$lang->api->noUniqueName = 'The API library name exists.'; -$lang->api->noUniqueVersion = 'The version exists.'; -$lang->api->createStruct = 'Create Data Structure'; -$lang->api->editStruct = 'Edit Data Structure'; -$lang->api->deleteStruct = 'Delete Data Structure'; -$lang->api->create = 'Create API'; -$lang->api->title = 'Name'; -$lang->api->pageTitle = 'API Library'; -$lang->api->module = 'Directory'; -$lang->api->apiDoc = 'API'; -$lang->api->manageType = 'Manage Directory'; -$lang->api->managePublish = 'Manage Version'; -$lang->api->doing = 'Doing'; -$lang->api->done = 'Done'; -$lang->api->basicInfo = 'Basic Information'; -$lang->api->apiDesc = 'Description'; -$lang->api->confirmDelete = "Do you want to delete this API?"; -$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; -$lang->api->filterStruct = "use struct"; -$lang->api->defaultVersion = "Current Version"; -$lang->api->zentaoAPI = "Zentao API v1"; -$lang->api->search = "Search"; -$lang->api->allLibs = "AllLibs"; -$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; -$lang->api->addCatalog = 'Add Catalog'; -$lang->api->editCatalog = 'Edit Catalog'; -$lang->api->sortCatalog = 'Catalog Sorting'; -$lang->api->deleteCatalog = 'Delete Catalog'; +$lang->api->index = 'API Space'; +$lang->api->editLib = 'Edit'; +$lang->api->releases = 'Release'; +$lang->api->deleteRelease = 'Delete Release'; +$lang->api->deleteLib = 'Delete API Doc'; +$lang->api->createRelease = 'Publish'; +$lang->api->createLib = 'Create API Library'; +$lang->api->createApi = 'Create API Document'; +$lang->api->createAB = 'Create'; +$lang->api->createDemo = 'Import ZenTao Library'; +$lang->api->edit = 'Edit'; +$lang->api->delete = 'Delete'; +$lang->api->position = 'Position'; +$lang->api->startLine = "%s,%s"; +$lang->api->desc = 'Description'; +$lang->api->debug = 'Debug'; +$lang->api->submit = 'Soumission'; +$lang->api->url = 'Request URL'; +$lang->api->result = 'Résultats'; +$lang->api->status = 'Statut'; +$lang->api->data = 'Données'; +$lang->api->noParam = "Aucun paramètre n'est requis si GET Debug"; +$lang->api->noModule = 'No directory in the API library. Please add the directory first'; +$lang->api->post = 'Se référer à la liste si POST Debug'; +$lang->api->noUniqueName = 'The API library name exists.'; +$lang->api->noUniqueVersion = 'The version exists.'; +$lang->api->createStruct = 'Create Data Structure'; +$lang->api->editStruct = 'Edit Data Structure'; +$lang->api->deleteStruct = 'Delete Data Structure'; +$lang->api->create = 'Create API'; +$lang->api->title = 'Name'; +$lang->api->pageTitle = 'API Library'; +$lang->api->module = 'Directory'; +$lang->api->apiDoc = 'API'; +$lang->api->manageType = 'Manage Directory'; +$lang->api->managePublish = 'Manage Version'; +$lang->api->doing = 'Doing'; +$lang->api->done = 'Done'; +$lang->api->basicInfo = 'Basic Information'; +$lang->api->apiDesc = 'Description'; +$lang->api->confirmDelete = "Do you want to delete this API?"; +$lang->api->confirmDeleteLib = "Do you want to delete this interface library?"; +$lang->api->confirmDeleteStruct = "Do you want to delete this data struct?"; +$lang->api->filterStruct = "use struct"; +$lang->api->defaultVersion = "Current Version"; +$lang->api->zentaoAPI = "Zentao API v1"; +$lang->api->search = "Search"; +$lang->api->allLibs = "AllLibs"; +$lang->api->noLinked = "No Linked {$lang->productCommon} and {$lang->projectCommon}"; +$lang->api->addCatalog = 'Add Catalog'; +$lang->api->editCatalog = 'Edit Catalog'; +$lang->api->sortCatalog = 'Catalog Sorting'; +$lang->api->deleteCatalog = 'Delete Catalog'; /* Common access control lang. */ $lang->api->whiteList = 'Whitelist'; diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php index 0289b447c4..6d3df7aeb0 100755 --- a/module/api/lang/zh-cn.php +++ b/module/api/lang/zh-cn.php @@ -14,58 +14,59 @@ $lang->api->getModel = '超级model调用接口'; $lang->api->sql = 'SQL查询接口'; $lang->api->manage = '接口管理'; -$lang->api->index = '接口空间'; -$lang->api->editLib = '编辑库'; -$lang->api->releases = '版本管理'; -$lang->api->deleteRelease = '删除版本'; -$lang->api->deleteLib = '删除库'; -$lang->api->createRelease = '发布接口'; -$lang->api->createLib = '创建库'; -$lang->api->createApi = '创建接口'; -$lang->api->createAB = '创建'; -$lang->api->createDemo = '导入禅道API'; -$lang->api->edit = '编辑接口'; -$lang->api->delete = '删除接口'; -$lang->api->position = '位置'; -$lang->api->startLine = "%s,%s行"; -$lang->api->desc = '描述'; -$lang->api->debug = '调试'; -$lang->api->submit = '提交'; -$lang->api->url = '请求地址'; -$lang->api->result = '返回结果'; -$lang->api->status = '状态'; -$lang->api->data = '内容'; -$lang->api->noParam = 'GET方式调试不需要输入参数，'; -$lang->api->noModule = '库下没有目录，请先维护目录'; -$lang->api->post = 'POST方式调试请参照页面表单'; -$lang->api->noUniqueName = '库名已存在。'; -$lang->api->noUniqueVersion = '版本已存在。'; -$lang->api->createStruct = '创建数据结构'; -$lang->api->editStruct = '编辑数据结构'; -$lang->api->deleteStruct = '删除数据结构'; -$lang->api->create = '创建接口'; -$lang->api->title = '接口名称'; -$lang->api->pageTitle = '库'; -$lang->api->module = '目录'; -$lang->api->apiDoc = '接口'; -$lang->api->manageType = '维护目录'; -$lang->api->managePublish = '版本管理'; -$lang->api->doing = '开发中'; -$lang->api->done = '开发完成'; -$lang->api->basicInfo = '基本信息'; -$lang->api->apiDesc = '接口说明'; -$lang->api->confirmDelete = "您确定删除该接口吗？"; -$lang->api->confirmDeleteLib = "您确定删除该库吗？"; -$lang->api->filterStruct = "使用数据结构填充"; -$lang->api->defaultVersion = "当前版本"; -$lang->api->zentaoAPI = "禅道API文档v1"; -$lang->api->search = "搜索"; -$lang->api->allLibs = "全部库"; -$lang->api->noLinked = "未关联{$lang->productCommon}和{$lang->projectCommon}"; -$lang->api->addCatalog = '添加目录'; -$lang->api->editCatalog = '编辑目录'; -$lang->api->sortCatalog = '目录排序'; -$lang->api->deleteCatalog = '删除目录'; +$lang->api->index = '接口空间'; +$lang->api->editLib = '编辑库'; +$lang->api->releases = '版本管理'; +$lang->api->deleteRelease = '删除版本'; +$lang->api->deleteLib = '删除库'; +$lang->api->createRelease = '发布接口'; +$lang->api->createLib = '创建库'; +$lang->api->createApi = '创建接口'; +$lang->api->createAB = '创建'; +$lang->api->createDemo = '导入禅道API'; +$lang->api->edit = '编辑接口'; +$lang->api->delete = '删除接口'; +$lang->api->position = '位置'; +$lang->api->startLine = "%s,%s行"; +$lang->api->desc = '描述'; +$lang->api->debug = '调试'; +$lang->api->submit = '提交'; +$lang->api->url = '请求地址'; +$lang->api->result = '返回结果'; +$lang->api->status = '状态'; +$lang->api->data = '内容'; +$lang->api->noParam = 'GET方式调试不需要输入参数，'; +$lang->api->noModule = '库下没有目录，请先维护目录'; +$lang->api->post = 'POST方式调试请参照页面表单'; +$lang->api->noUniqueName = '库名已存在。'; +$lang->api->noUniqueVersion = '版本已存在。'; +$lang->api->createStruct = '创建数据结构'; +$lang->api->editStruct = '编辑数据结构'; +$lang->api->deleteStruct = '删除数据结构'; +$lang->api->create = '创建接口'; +$lang->api->title = '接口名称'; +$lang->api->pageTitle = '库'; +$lang->api->module = '目录'; +$lang->api->apiDoc = '接口'; +$lang->api->manageType = '维护目录'; +$lang->api->managePublish = '版本管理'; +$lang->api->doing = '开发中'; +$lang->api->done = '开发完成'; +$lang->api->basicInfo = '基本信息'; +$lang->api->apiDesc = '接口说明'; +$lang->api->confirmDelete = "您确定删除该接口吗？"; +$lang->api->confirmDeleteLib = "您确定删除该库吗？"; +$lang->api->confirmDeleteStruct = "您确定删除该数据结构吗？"; +$lang->api->filterStruct = "使用数据结构填充"; +$lang->api->defaultVersion = "当前版本"; +$lang->api->zentaoAPI = "禅道API文档v1"; +$lang->api->search = "搜索"; +$lang->api->allLibs = "全部库"; +$lang->api->noLinked = "未关联{$lang->productCommon}和{$lang->projectCommon}"; +$lang->api->addCatalog = '添加目录'; +$lang->api->editCatalog = '编辑目录'; +$lang->api->sortCatalog = '目录排序'; +$lang->api->deleteCatalog = '删除目录'; /* Common access control lang. */ $lang->api->whiteList = '白名单'; diff --git a/module/api/model.php b/module/api/model.php index 4b17fb67c6..50e7605d23 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -173,6 +173,7 @@ class apiModel extends model ->add('lib', $old->lib) ->add('editedBy', $this->app->user->account) ->add('editedDate', $now) + ->stripTags($this->config->api->editor->editstruct['id'], $this->config->allowedTags) ->remove('undefined') ->get(); diff --git a/module/api/ui/create.html.php b/module/api/ui/create.html.php index d4c3d27fda..1e85a06660 100644 --- a/module/api/ui/create.html.php +++ b/module/api/ui/create.html.php @@ -16,6 +16,7 @@ formPanel set::label($lang->api->lib), input ( + set::name(''), set::value($libName), set::disabled(true) ) @@ -110,7 +111,7 @@ formPanel set::id('form-header'), setClass('params-group'), set::label($lang->api->header), - h::table + h::table ( setClass('table condensed bordered'), h::tr @@ -177,7 +178,7 @@ formPanel set::id('form-query'), setClass('params-group'), set::label($lang->api->query), - h::table + h::table ( setClass('table condensed bordered'), h::tr @@ -257,7 +258,7 @@ formPanel set::id('form-params'), setClass('params-group'), set::label($lang->api->params), - h::table + h::table ( setClass('table condensed bordered'), h::tr @@ -294,13 +295,17 @@ formPanel set('data-parent', '0'), h::td ( - input(), + input + ( + set::name(''), + ), ), h::td ( select ( setClass('objectType'), + set::name(''), set::value('object'), set::items($lang->api->paramsTypeOptions) ) @@ -356,7 +361,7 @@ formPanel set::id('form-response'), setClass('response'), set::label($lang->api->response), - h::table + h::table ( setClass('table condensed bordered'), h::tr @@ -393,13 +398,17 @@ formPanel set('data-parent', '0'), h::td ( - input(), + input + ( + set::name(''), + ), ), h::td ( select ( setClass('objectType'), + set::name(''), set::value('object'), set::items($lang->api->paramsTypeOptions) ) diff --git a/module/api/ui/editstruct.html.php b/module/api/ui/editstruct.html.php index 59e0305e94..12273ac032 100644 --- a/module/api/ui/editstruct.html.php +++ b/module/api/ui/editstruct.html.php @@ -29,6 +29,7 @@ if(!empty($struct->attribute)) $level ? setStyle('padding-left', ($level + 1) * 10 . 'px') : null, input ( + set::name(''), set::value($data['field']) ) ), @@ -37,6 +38,7 @@ if(!empty($struct->attribute)) select ( setClass('objectType'), + set::name(''), set::value($data['paramsType']), set::items($typeList) ) @@ -50,6 +52,7 @@ if(!empty($struct->attribute)) textarea ( set::rows(1), + set::name(''), set::value($data['desc']) ), ), @@ -98,13 +101,17 @@ else set('data-parent', '0'), h::td ( - input(), + input + ( + set::name(''), + ), ), h::td ( select ( setClass('objectType'), + set::name(''), set::value('object'), set::items($lang->api->paramsTypeOptions) ) @@ -117,7 +124,8 @@ else ( textarea ( - set::rows(1) + set::rows(1), + set::name(''), ), ), h::td @@ -220,7 +228,7 @@ formPanel editor ( set::name('desc'), - set::value($struct->desc) + html($struct->desc) ), ), ); diff --git a/module/api/ui/releases.html.php b/module/api/ui/releases.html.php index 2e3c48c624..5716762275 100644 --- a/module/api/ui/releases.html.php +++ b/module/api/ui/releases.html.php @@ -12,7 +12,7 @@ namespace zin; set::title($lang->api->releases); -if(empty($release)) +if(empty($releases)) { div (