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

* adjust task #49362 and check priv.

Browse Source
This commit is contained in:
王怡栋
2022-03-01 11:23:44 +08:00
parent fb48581a76
commit 44be255e67
4 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
extension/lite/doc/ext/view/objectlibs.lite.html.hook.php
+1 -1
View File
@@ -10,7 +10,7 @@ $('#pageNav .btn-group #dropMenu .table-col .list-group a[href*="showFiles"]').r
</script>
<?php endif;?>
<?php if(!empty($doc) and !$doc->deleted and $doc->version > 1 and common::hasPriv('doc', 'diff')):?>
<?php if(!empty($doc) and !$doc->deleted and $doc->version > 1 and common::hasPriv('doc', 'diff') and $config->edition != 'open'):?>
<?php
$versions = array();
$i = 1;
extension/lite/user/ext/view/featurebar.lite.html.hook.php
+2 -2
View File
@@ -1,6 +1,6 @@
<script>
$('#mainMenu .btn-toolbar > a[href*="bug"], a[href*="testtask"], a[href*="testcase"], a[href*="issue"], a[href*="risk"], a[href*="requirement"]').remove();
<?php if($this->config->edition != 'open'):?>
$('#mainMenu .btn-toolbar > a:first').attr('href', createLink('user', 'todocalendar', 'userID=<?php echo $user->id?>'));
<?php if($this->config->edition != 'open' and common::hasPriv('user', 'todocalendar')):?>
$('#mainMenu .btn-toolbar > a:first[href*="todo"]').attr('href', createLink('user', 'todocalendar', 'userID=<?php echo $user->id?>'));
<?php endif;?>
</script>
module/doc/model.php
+8 -5
View File
@@ -516,12 +516,15 @@ class docModel extends model
/* When file change then version add one. */
$files = $this->loadModel('file')->getByObject('doc', $docID);
$docFiles = array();
foreach($files as $file)
if($docContent)
{
$pathName = $this->file->getRealPathName($file->pathname);
$file->webPath = $this->file->webPath . $pathName;
$file->realPath = $this->file->savePath . $pathName;
if(strpos(",{$docContent->files},", ",{$file->id},") !== false) $docFiles[$file->id] = $file;
foreach($files as $file)
{
$pathName = $this->file->getRealPathName($file->pathname);
$file->webPath = $this->file->webPath . $pathName;
$file->realPath = $this->file->savePath . $pathName;
if(strpos(",{$docContent->files},", ",{$file->id},") !== false) $docFiles[$file->id] = $file;
}
}
/* Check file change. */
module/project/view/team.html.php
+1 -1
View File
@@ -67,7 +67,7 @@
<tr>
<td>
<?php
if(common::hasPriv('user', 'view'))
if(common::hasPriv('user', 'view') and common::hasPriv('my', 'team'))
{
$link = isset($deptUsers[$member->userID]) ? $this->createLink('user', 'view', "userID={$member->userID}") : "javascript: alert(noAccess);";
echo html::a($link, $member->realname, '', 'data-app="system"');