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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
王怡栋
2021-08-11 10:55:02 +08:00
parent 5b33d7efde fa86185291
commit 3adf8b4257
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/zentaopms.php
+2 -2
View File
@@ -98,8 +98,8 @@ $config->hourPointCommonList['vi'][0] = 'giờ';
$config->hourPointCommonList['vi'][1] = 'điểm';
$config->hourPointCommonList['vi'][2] = 'function point';
$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao';
$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao';
$config->manualUrl['home'] = 'https://www.zentao.net/book/zentaopmshelp.html?fullScreen=zentao&theme=' . $_COOKIE['theme'];
$config->manualUrl['int'] = 'https://www.zentao.pm/book/zentaomanual/zentao-installation-11.html?fullScreen=zentao&theme=' . $_COOKIE['theme'];
/* Supported charsets. */
$config->charsets['zh-cn']['utf-8'] = 'UTF-8';
module/doc/view/tablecontents.html.php
+9 -6
View File
@@ -104,13 +104,16 @@ if(empty($type)) $type = 'product';
echo $html;
?>
<?php
if($type == 'book')
if(!empty($libs))
{
common::printLink('doc', 'manageBook', "bookID=$libID", $lang->doc->manageBook, '', "class='btn btn-info btn-wide'");
}
elseif(!empty($libs))
{
common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType, '', "class='btn btn-info btn-wide iframe'", '', true);
if($type == 'book')
{
common::printLink('doc', 'manageBook', "bookID=$libID", $lang->doc->manageBook, '', "class='btn btn-info btn-wide'");
}
else
{
common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType, '', "class='btn btn-info btn-wide iframe'", '', true);
}
}
?>
</div>
module/index/js/index.js
+1 -1
View File
@@ -463,7 +463,7 @@
{
var $item = $(this);
var isDivider = $item.hasClass('divider');
var height = isDivider ? 17 : 40;
var height = isDivider ? 17 : $item.outerHeight();
currentHeight += height;
if(currentHeight > maxHeight)
{
module/my/model.php
+2 -2
View File
@@ -114,7 +114,7 @@ class myModel extends model
if(isset($stories[$product->id])) $product->stories = $stories[$product->id];
if(isset($executions[$product->id])) $product->executions = $executions[$product->id];
}
$data['chargeProducts'] = $products;
$data['chargeProducts'] = array_values($products);
/* All projects. */
$projects = $this->loadModel('project')->getOverviewList('byStatus', 'all', 'order_asc');
@@ -126,7 +126,7 @@ class myModel extends model
$projects[$key]->progress = ($workhour->totalConsumed + $workhour->totalLeft) ? floor($workhour->totalConsumed / ($workhour->totalConsumed + $workhour->totalLeft) * 1000) / 1000 * 100 : 0;
}
}
$data['projects'] = $projects;
$data['projects'] = array_values($projects);
/* Todo list. */
if(common::hasPriv('todo', 'view')) $hasViewPriv['todo'] = true;
module/project/view/browsebycard.html.php
+2 -2
View File
@@ -146,13 +146,13 @@
<?php foreach($project->teamMembers as $key => $member):?>
<?php if($key > 2) continue;?>
<div class='avatar bg-secondary avatar-circle'>
<?php echo !empty(zget($usersAvatar, $member, '')) ? html::image(zget($usersAvatar, $member)) : strtoupper($member[0]);?>
<?php echo !empty($usersAvatar[$member]) ? html::image(zget($usersAvatar, $member)) : strtoupper($member[0]);?>
</div>
<?php endforeach;?>
<?php if($project->teamCount > 3):?>
<?php echo '...';?>
<div class='avatar bg-secondary avatar-circle'>
<?php echo !empty(zget($usersAvatar, end($project->teamMembers), '')) ? html::image(zget($usersAvatar, end($project->teamMembers))) : strtoupper($member[0]);?>
<?php echo !empty($usersAvatar[end($project->teamMembers)]) ? html::image(zget($usersAvatar, end($project->teamMembers))) : strtoupper($member[0]);?>
</div>
<?php endif;?>
</a>