Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug of task #89144.

Browse Source
This commit is contained in:
liumengyi
2023-03-30 14:33:33 +08:00
parent f1f9a33779
commit aeb24656f9
7 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/api/js/common.js
+3 -3
View File
@@ -19,13 +19,13 @@ function loadDocModule(libID)
*/
function toggleAcl(acl, type)
{
if(acl == 'open')
if(acl == 'private')
{
$('#whiteListBox').addClass('hidden');
$('#whiteListBox').removeClass('hidden');
}
else
{
$('#whiteListBox').removeClass('hidden');
$('#whiteListBox').addClass('hidden');
}
}
module/api/lang/de.php
+1 -1
View File
@@ -65,7 +65,7 @@ $lang->api->noLinked = "No Linked";
/* Common access control lang. */
$lang->api->whiteList = 'Whitelist';
$lang->api->aclList['open'] = "Public <span class='acl-tip'>(Users who can access doccan access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s or users in the whiltelist can access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s can access it)</span>";
$lang->api->aclList['private'] = "Private <span class='acl-tip'> (Only the one who created it or users in the whiltelist can access it)</span>";
$lang->api->group = 'Group';
$lang->api->user = 'User';
module/api/lang/en.php
+1 -1
View File
@@ -65,7 +65,7 @@ $lang->api->noLinked = "No Linked";
/* Common access control lang. */
$lang->api->whiteList = 'Whitelist';
$lang->api->aclList['open'] = "Public <span class='acl-tip'>(Users who can access doccan access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s or users in the whiltelist can access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s can access it)</span>";
$lang->api->aclList['private'] = "Private <span class='acl-tip'> (Only the one who created it or users in the whiltelist can access it)</span>";
$lang->api->group = 'Group';
$lang->api->user = 'User';
module/api/lang/fr.php
+1 -1
View File
@@ -65,7 +65,7 @@ $lang->api->noLinked = "No Linked";
/* Common access control lang. */
$lang->api->whiteList = 'Whitelist';
$lang->api->aclList['open'] = "Public <span class='acl-tip'>(Users who can access doccan access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s or users in the whiltelist can access it)</span>";
$lang->api->aclList['default'] = "Default <span class='acl-tip'>(Users who can access the selected %s can access it)</span>";
$lang->api->aclList['private'] = "Private <span class='acl-tip'> (Only the one who created it or users in the whiltelist can access it)</span>";
$lang->api->group = 'Group';
$lang->api->user = 'User';
module/api/lang/zh-cn.php
+1 -1
View File
@@ -65,7 +65,7 @@ $lang->api->noLinked = "无关联";
/* Common access control lang. */
$lang->api->whiteList = '白名单';
$lang->api->aclList['open'] = "公开 <span class='acl-tip'>（有文档视图权限即可访问）</span>";
$lang->api->aclList['default'] = "默认 <span class='acl-tip'>（有所选%s访问权限用户和白名单用户可以访问）</span>";
$lang->api->aclList['default'] = "默认 <span class='acl-tip'>（有所选%s访问权限用户可以访问）</span>";
$lang->api->aclList['private'] = "私有 <span class='acl-tip'>（仅创建者和白名单用户可访问）</span>";
$lang->api->group = '分组';
$lang->api->user = '用户';
module/doc/js/createlib.js
+4
View File
@@ -18,12 +18,16 @@ function changeDoclibAcl(libType)
$('.apilib').removeClass('hidden');
$('#mainContent table th').css('width', '100px');
$('#aclBox').find('td').html($('#aclAPIBox td').html());
$('.executionBox').addClass('hidden');
}
else
{
$('.apilib').addClass('hidden');
$('#mainContent table th').css('width', '70px');
$('#aclBox').find('td').html($('#aclOtherBox td').html());
$('.executionBox').removeClass('hidden');
}
$('#whiteListBox').addClass('hidden');
}
module/doc/model.php
+2 -2
View File
@@ -195,8 +195,8 @@ class docModel extends model
{
$lib = fixer::input('post')
->setForce('product', ($this->post->type == 'product' and !empty($_POST['product'])) ? $this->post->product : 0)
->setForce('project', ($this->post->type == 'project' and !empty($_POST['product'])) ? $this->post->project : 0)
->setForce('execution', ($this->post->type == 'execution' or !empty($_POST['execution'])) ? $this->post->execution : 0)
->setForce('project', ($this->post->type == 'project' and !empty($_POST['project'])) ? $this->post->project : 0)
->setForce('execution', ($this->post->libType != 'api' and !empty($_POST['execution'])) ? $this->post->execution : 0)
->join('groups', ',')
->join('users', ',')
->add('addedBy', $this->app->user->account)