diff --git a/module/api/lang/de.php b/module/api/lang/de.php index 8843f01349..7ef91caa48 100644 --- a/module/api/lang/de.php +++ b/module/api/lang/de.php @@ -12,6 +12,7 @@ $lang->api->common = 'API'; $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'; diff --git a/module/api/lang/en.php b/module/api/lang/en.php index d635929153..730ff6cb04 100644 --- a/module/api/lang/en.php +++ b/module/api/lang/en.php @@ -12,6 +12,7 @@ $lang->api->common = 'API'; $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'; diff --git a/module/api/lang/fr.php b/module/api/lang/fr.php index 2ef819831d..394a00af55 100644 --- a/module/api/lang/fr.php +++ b/module/api/lang/fr.php @@ -12,6 +12,7 @@ $lang->api->common = 'API'; $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'; diff --git a/module/api/lang/zh-cn.php b/module/api/lang/zh-cn.php index bea818e109..dec5f9077a 100755 --- a/module/api/lang/zh-cn.php +++ b/module/api/lang/zh-cn.php @@ -12,6 +12,7 @@ $lang->api->common = 'API接口'; $lang->api->getModel = '超级model调用接口'; $lang->api->sql = 'SQL查询接口'; +$lang->api->manage = '接口管理'; $lang->api->index = '接口空间'; $lang->api->editLib = '编辑库'; diff --git a/module/api/model.php b/module/api/model.php index 4efcb994e1..6ff29d950e 100644 --- a/module/api/model.php +++ b/module/api/model.php @@ -986,13 +986,13 @@ class apiModel extends model $normalObjects = $closedObjects = array(); $libs = $this->loadModel('doc')->getApiLibs(); - $products = $this->dao->select('t1.id, t1.name, t1.status')->from(TABLE_PRODUCT)->alias('t1') + $products = $this->dao->select('t1.id, t1.order, t1.name, t1.status')->from(TABLE_PRODUCT)->alias('t1') ->leftjoin(TABLE_DOCLIB)->alias('t2')->on('t2.product=t1.id') ->where('t2.id')->gt(0) ->andWhere('t1.vision')->eq($this->config->vision) ->andWhere('t1.deleted')->eq(0) ->andWhere('t2.id')->in(array_keys($libs)) - ->orderBy('id_desc') + ->orderBy('order_asc') ->fetchAll('id'); foreach($products as $id => $product) @@ -1007,14 +1007,14 @@ class apiModel extends model } } - $projects = $this->dao->select('t1.id, t1.name, t1.status')->from(TABLE_PROJECT)->alias('t1') + $projects = $this->dao->select('t1.id, t1.order, t1.name, t1.status')->from(TABLE_PROJECT)->alias('t1') ->leftjoin(TABLE_DOCLIB)->alias('t2')->on('t2.project=t1.id') ->where('t2.id')->gt(0) ->andWhere('t1.vision')->eq($this->config->vision) ->andWhere('t1.deleted')->eq(0) ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi() ->andWhere('t2.id')->in(array_keys($libs)) - ->orderBy('t1.hasProduct_asc, id_desc') + ->orderBy('t1.hasProduct_asc, order_asc') ->fetchAll('id'); foreach($projects as $id => $project) diff --git a/module/doc/lang/de.php b/module/doc/lang/de.php index 6946d41980..bab46df315 100644 --- a/module/doc/lang/de.php +++ b/module/doc/lang/de.php @@ -125,6 +125,7 @@ $lang->doc->defaultSave = 'Default Save: '; $lang->doc->position = 'Position'; $lang->doc->person = 'Person'; $lang->doc->team = 'Team'; +$lang->doc->manage = 'Document Management'; $lang->doc->moduleDoc = 'Nach Modulen'; $lang->doc->searchDoc = 'Suche'; diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php index 7dbcaaf756..b00d1dd17f 100644 --- a/module/doc/lang/en.php +++ b/module/doc/lang/en.php @@ -125,6 +125,7 @@ $lang->doc->defaultSave = 'Default Save: '; $lang->doc->position = 'Position'; $lang->doc->person = 'Person'; $lang->doc->team = 'Team'; +$lang->doc->manage = 'Document Management'; $lang->doc->moduleDoc = 'By Module'; $lang->doc->searchDoc = 'Search'; diff --git a/module/doc/lang/fr.php b/module/doc/lang/fr.php index 631df9e298..eafc223046 100644 --- a/module/doc/lang/fr.php +++ b/module/doc/lang/fr.php @@ -125,6 +125,7 @@ $lang->doc->defaultSave = 'Default Save: '; $lang->doc->position = 'Position'; $lang->doc->person = 'Person'; $lang->doc->team = 'Team'; +$lang->doc->manage = 'Document Management'; $lang->doc->moduleDoc = 'Par Module'; $lang->doc->searchDoc = 'Rechercher'; diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index b4d576f400..35fe7f5c5f 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -125,6 +125,7 @@ $lang->doc->defaultSave = '默认存入:'; $lang->doc->position = '所在位置'; $lang->doc->person = '个人'; $lang->doc->team = '团队'; +$lang->doc->manage = '文档管理'; $lang->doc->moduleDoc = '按模块浏览'; $lang->doc->searchDoc = '搜索'; diff --git a/module/group/view/privbygroup.html.php b/module/group/view/privbygroup.html.php index 60f178bf87..856b9a1fb0 100644 --- a/module/group/view/privbygroup.html.php +++ b/module/group/view/privbygroup.html.php @@ -108,7 +108,9 @@