Merge branch 'master' into 'sprint/206'

# Conflicts:
#   db/update17.1.sql
This commit is contained in:
王怡栋
2022-06-22 07:26:11 +00:00
285 changed files with 11060 additions and 4217 deletions
+3 -2
View File
@@ -83,8 +83,9 @@
<tr>
<th><?php echo $lang->doclib->control;?></th>
<td colspan='2'>
<?php echo html::radio('acl', $lang->doc->aclList, $doc->acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
<span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$doc->acl];?></span>
<?php $acl = $lib->acl == 'default' ? 'open' : $lib->acl;?>
<?php echo html::radio('acl', $lang->doc->aclList, $acl, "onchange='toggleAcl(this.value, \"doc\")'")?>
<span class='text-info' id='noticeAcl'><?php echo $lang->doc->noticeAcl['doc'][$acl];?></span>
</td>
</tr>
<tr id='whiteListBox' class='hidden'>