diff --git a/db/zentaopms299.sql b/db/zentaopms299.sql index ed18af9332..4b97b5949c 100644 --- a/db/zentaopms299.sql +++ b/db/zentaopms299.sql @@ -8,6 +8,7 @@ UPDATE `zt_doclib` SET `acl` = 'private' WHERE `type` = 'project' AND `acl` = 'c UPDATE `zt_doclib` SET `acl` = 'default' WHERE `type` = 'project' AND `acl` IN ('open', 'private'); UPDATE `zt_doclib` SET `acl` = 'private' WHERE `type` = 'api' and `acl` = 'custom'; UPDATE `zt_doclib` SET `acl` = 'default' WHERE `type` = 'api' and `acl` = 'open'; +UPDATE `zt_doclib` SET `acl` = 'default' WHERE `main` = '1'; ALTER TABLE `zt_doclib` ADD `addedBy` varchar(30) NOT NULL AFTER `order`; ALTER TABLE `zt_doclib` ADD `addedDate` datetime NOT NULL AFTER `addedBy`; diff --git a/module/doc/control.php b/module/doc/control.php index 99717a85e6..adc3012ec1 100755 --- a/module/doc/control.php +++ b/module/doc/control.php @@ -259,6 +259,7 @@ class doc extends control $this->lang->doclib->aclList['private'] = sprintf($this->lang->doclib->privateACL, $this->lang->{$type}->common); unset($this->lang->doclib->aclList['open']); } + if(!empty($lib->main)) unset($this->lang->doclib->aclList['private'], $this->lang->doclib->aclList['open']); $this->view->lib = $lib; $this->view->groups = $this->loadModel('group')->getPairs(); diff --git a/module/doc/view/editlib.html.php b/module/doc/view/editlib.html.php index 1bf5f86e04..19002ab408 100644 --- a/module/doc/view/editlib.html.php +++ b/module/doc/view/editlib.html.php @@ -44,8 +44,9 @@ doclib->control;?> - type != 'api') echo html::radio('acl', $lang->doclib->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?> - type == 'api') echo html::radio('acl', $lang->api->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?> + type != 'api' and empty($lib->main)) echo html::radio('acl', $lang->doclib->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?> + type == 'api' and empty($lib->main)) echo html::radio('acl', $lang->api->aclList, $lib->acl, "onchange='toggleAcl(this.value, \"lib\")'", 'block')?> + main)) echo html::radio('acl', $lang->doclib->aclList, 'default', "onchange='toggleAcl(this.value, \"lib\")'", 'block');;?> diff --git a/module/project/model.php b/module/project/model.php index 40f6172726..add0c030e6 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1416,7 +1416,7 @@ class projectModel extends model $lib->name = $this->lang->doclib->main['project']; $lib->type = 'project'; $lib->main = '1'; - $lib->acl = $project->acl != 'program' ? $project->acl : 'custom'; + $lib->acl = 'default'; $lib->users = ',' . implode(',', array_filter($authorizedUsers)) . ','; $lib->vision = zget($project, 'vision', 'rnd'); $this->dao->insert(TABLE_DOCLIB)->data($lib)->exec();