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

* Merge code.

Browse Source
This commit is contained in:
Yagami
2021-01-27 15:20:27 +08:00
parent a986454abd
commit ac77fa3a15
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+5 -5
View File
@@ -141,13 +141,13 @@ package:
rm -rf zentaopms/tools
pms:
make common
#make zentaoxx
#unzip zentaoxx.*.zip
#cp zentaoxx/* zentaopms/ -r
#cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
make zentaoxx
unzip zentaoxx.*.zip
cp zentaoxx/* zentaopms/ -r
cat zentaoxx/db/xuanxuan.sql >> zentaopms/db/zentao.sql
make package
zip -rq -9 ZenTaoPMS.$(VERSION).zip zentaopms
rm -fr zentaopms #zentaoxx zentaoxx.*.zip
rm -fr zentaopms #entaoxx zentaoxx.*.zip
deb:
mkdir buildroot
cp -r build/debian/DEBIAN buildroot
module/block/lang/zh-cn.php
+2 -2
View File
@@ -48,8 +48,8 @@ $lang->block->delayed = '已延期';
$lang->block->noData = '当前统计类型下暂无数据';
$lang->block->emptyTip = '暂无信息';
$lang->block->createdTodos = '创建的待办数';
$lang->block->createdRequirements = '创建的' . $lang->generalUR . '数';
$lang->block->createdStories = '创建的' . $lang->generalSR . '数';
$lang->block->createdRequirements = '创建的' . $lang->URCommon . '数';
$lang->block->createdStories = '创建的' . $lang->SRCommon . '数';
$lang->block->finishedTasks = '完成的任务数';
$lang->block->createdBugs = '提交的Bug数';
$lang->block->resolvedBugs = '解决的Bug数';
module/block/view/contribute.html.php
+4 -4
View File
@@ -8,11 +8,11 @@
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdRequirements;?></div>
<div class="tile-amount"><?php echo empty($data['createdRequirements']) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=requirement'), (int)$data['createdRequirements']);?></div>
<div class="tile-amount"><?php echo empty($data['createdRequirements']) ? 0 : (int)$data['createdRequirements'];?></div>
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdStories;?></div>
<div class="tile-amount"><?php echo empty($data['createdStories']) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=story'), (int)$data['createdStories']);?></div>
<div class="tile-amount"><?php echo empty($data['createdStories']) ? 0 : (int)$data['createdStories'];?></div>
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->finishedTasks;?></div>
@@ -20,7 +20,7 @@
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdBugs;?></div>
<div class="tile-amount"><?php echo empty($data['createdBugs']) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=bug'), (int)$data['createdBugs']);?></div>
<div class="tile-amount"><?php echo empty($data['createdBugs']) ? 0 : (int)$data['createdBugs'];?></div>
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->resolvedBugs;?></div>
@@ -28,7 +28,7 @@
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdCases;?></div>
<div class="tile-amount"><?php echo empty($data['createdCases']) ? 0 : html::a($this->createLink('my', 'contribute', 'mode=testcase&type=openedbyme'), (int)$data['createdCases']);?></div>
<div class="tile-amount"><?php echo empty($data['createdCases']) ? 0 : (int)$data['createdCases'];?></div>
</div>
<div class="col-xs-4 tile">
<div class="tile-title"><?php echo $lang->block->createdRisks;?></div>
module/upgrade/control.php
+4 -1
View File
@@ -23,7 +23,10 @@ class upgrade extends control
$upgradeFile = $this->app->wwwRoot . 'upgrade.php';
if(!file_exists($upgradeFile)) $this->locate($this->createLink('my', 'index'));
if(version_compare($this->config->installedVersion, '20', '<'))
if((version_compare($this->config->installedVersion, '20', '<')
|| strpos($config->version, 'biz') !== false
|| strpos($config->version, 'pro') !== false)
&& strpos($config->version, 'max') === false)
{
/* Judge upgrade step. */
$upgradeStep = $this->loadModel('setting')->getItem('owner=system&module=common&section=global&key=upgradeStep');