diff --git a/module/doc/css/common.css b/module/doc/css/common.css index ac104128cb..d4a443ce53 100644 --- a/module/doc/css/common.css +++ b/module/doc/css/common.css @@ -104,3 +104,5 @@ ol, ul {margin-bottom: 0} #subHeader .list-group>a.selected {color: #e9f2fb !important;} #pageNav #dropMenu .table-col .list-group .icon-move {display:block; float: left; font-size: 12px; padding: 3px 4px 3px 1px;} + +#aclBox .acl-tip {color: #838a9d;} diff --git a/module/doc/css/createlib.css b/module/doc/css/createlib.css index 0824b194ac..71b9de4c32 100644 --- a/module/doc/css/createlib.css +++ b/module/doc/css/createlib.css @@ -3,7 +3,6 @@ form {margin-bottom: 50px;} table {width: 90% !important;} #mainContent table th {width: 70px;} -#aclBox .acl-tip {color: #838a9d;} #whiteListBox div.input-group {margin-bottom: 2px;} #product_chosen {width: 50% !important;} diff --git a/module/doc/lang/zh-cn.php b/module/doc/lang/zh-cn.php index 90377c326c..aa38f53a81 100644 --- a/module/doc/lang/zh-cn.php +++ b/module/doc/lang/zh-cn.php @@ -149,7 +149,7 @@ $lang->doc->api = '接口'; $lang->doc->collectAction = '收藏文档'; -$lang->doc->libName = '文档库名称'; +$lang->doc->libName = '库名称'; $lang->doc->libType = '库类型'; $lang->doc->custom = '自定义文档库'; $lang->doc->customAB = '自定义库'; diff --git a/module/doc/model.php b/module/doc/model.php index d4a1433b43..99134bebda 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -296,21 +296,15 @@ class docModel extends model ->setDefault('groups', '') ->join('groups', ',') ->join('users', ',') + ->remove('uid,contactListMenu') ->get(); - if($oldLib->type == 'project' or $oldLib->type == 'custom') + if($oldLib->type == 'project') { $libCreatedBy = $this->dao->select('*')->from(TABLE_ACTION)->where('objectType')->eq('doclib')->andWhere('objectID')->eq($libID)->andWhere('action')->eq('created')->fetch('actor'); - if($oldLib->type == 'custom') - { - if($lib->acl == 'private') $lib->users = $libCreatedBy ? $libCreatedBy : $this->app->user->account; - } - else - { - $openedBy = $this->dao->findById($oldLib->project)->from(TABLE_PROJECT)->fetch('openedBy'); - if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy; - } + $openedBy = $this->dao->findById($oldLib->project)->from(TABLE_PROJECT)->fetch('openedBy'); + if($lib->acl == 'private' and $lib->acl == 'custom') $lib->users .= ',' . $libCreatedBy ? $libCreatedBy : $openedBy; } if($oldLib->acl != $lib->acl and $lib->acl == 'open') $lib->users = ''; diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 4c1e96c8a1..289003caa7 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -47,7 +47,7 @@ doc->libTypeList, $lib->type);?> -