diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css index 76a60b2c07..a3b21f7701 100644 --- a/module/doc/css/createlib.css +++ b/module/doc/css/createlib.css @@ -10,4 +10,4 @@ table {width: 90% !important;} #execution_chosen {width: 50% !important;} #groups_chosen.chosen-container .chosen-results, #users_chosen.chosen-container .chosen-results {max-height: 160px;} -.objectBox > td.required:after {right: 274px;} +.objectBox > td.required:after {right: 180px;} diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 500ca44013..bc52e2c0cd 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -21,6 +21,9 @@ $lang->doclib->execution = $lang->executionCommon . ' Bibliothek'; $lang->doclib->product = $lang->productCommon . ' Bibliothek'; $lang->doclib->apiLibName = 'Api Library Name'; +$lang->doclib->type['wiki'] = 'WIKI'; +$lang->doclib->type['api'] = 'API'; + $lang->doclib->aclListA = array(); $lang->doclib->aclListA['default'] = 'Default'; $lang->doclib->aclListA['custom'] = 'Custom'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 9d42859f92..b89b43a712 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -21,6 +21,9 @@ $lang->doclib->execution = $lang->executionCommon . ' Library'; $lang->doclib->product = $lang->productCommon . ' Library'; $lang->doclib->apiLibName = 'Api Library Name'; +$lang->doclib->type['wiki'] = 'WIKI'; +$lang->doclib->type['api'] = 'API'; + $lang->doclib->aclListA = array(); $lang->doclib->aclListA['default'] = 'Default'; $lang->doclib->aclListA['custom'] = 'Custom'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 7b13f067db..87766324db 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -21,6 +21,9 @@ $lang->doclib->execution = 'Bibliothèque ' . $lang->executionCommon; $lang->doclib->product = $lang->productCommon . ' Library'; $lang->doclib->apiLibName = 'Api Library Name'; +$lang->doclib->type['wiki'] = 'WIKI'; +$lang->doclib->type['api'] = 'API'; + $lang->doclib->aclListA = array(); $lang->doclib->aclListA['default'] = 'Défaut'; $lang->doclib->aclListA['custom'] = 'Person.'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 7d7fc75828..429fcafb6b 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -21,6 +21,9 @@ $lang->doclib->execution = $lang->executionCommon . '库'; $lang->doclib->product = $lang->productCommon . '库'; $lang->doclib->apiLibName = '接口库名称'; +$lang->doclib->type['wiki'] = 'WIKI文档库'; +$lang->doclib->type['api'] = '接口库'; + $lang->doclib->aclListA = array(); $lang->doclib->aclListA['default'] = '默认'; $lang->doclib->aclListA['custom'] = '自定义'; @@ -146,7 +149,7 @@ $lang->doc->api = '接口'; $lang->doc->collectAction = '收藏文档'; $lang->doc->libName = '文档库名称'; -$lang->doc->libType = '文档库类型'; +$lang->doc->libType = '库类型'; $lang->doc->custom = '自定义文档库'; $lang->doc->customAB = '自定义库'; $lang->doc->createLib = '创建库'; diff --git a/module/doc/model.php b/module/doc/model.php index 129107b1fd..66210831eb 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -193,10 +193,11 @@ class docModel extends model { $lib = fixer::input('post') ->setForce('product', $this->post->type == 'product' ? $this->post->product : 0) + ->setForce('project', $this->post->type == 'project' ? $this->post->project : 0) ->setForce('execution', $this->post->type == 'execution' ? $this->post->execution : 0) ->join('groups', ',') ->join('users', ',') - ->remove('uid,contactListMenu') + ->remove('uid,contactListMenu,libType') ->get(); if($lib->type == 'execution' and $lib->execution) diff --git a/module/doc/view/createlib.html.php b/module/doc/view/createlib.html.php index b6bf8067e3..0e493ca14e 100644 --- a/module/doc/view/createlib.html.php +++ b/module/doc/view/createlib.html.php @@ -27,15 +27,17 @@