Merge branch 'sprint/master_zhouxudong_60393' into 'master'

* Finish task #60393.

See merge request easycorp/zentaopms!4487
This commit is contained in:
王怡栋
2022-07-13 02:02:44 +00:00
2 changed files with 3 additions and 6 deletions
+2 -5
View File
@@ -3701,11 +3701,8 @@ class execution extends control
$parents = array();
if($parentIdList) $parents = $this->execution->getByIdList($parentIdList);
$allExecutionsNum = $this->dao->select('COUNT(id) AS count')->from(TABLE_PROJECT)
->where('project')->eq($projectID)
->andWhere('deleted')->eq(0)
->fetch();
$this->view->allExecutionsNum = $allExecutionsNum;
$allExecutionsNum = $this->project->getStats($projectID, 'all');
$this->view->allExecutionsNum = count($allExecutionsNum);
$this->view->executionStats = $executionStats;
$this->view->productList = $this->loadModel('product')->getProductPairsByProject($projectID);
+1 -1
View File
@@ -73,7 +73,7 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN())
<div class="table-empty-tip">
<p>
<span class="text-muted"><?php echo $from == 'execution' ? $lang->execution->noExecutions : $lang->execution->noExecution;?></span>
<?php if(empty($allExecutionsNum->count)):?>
<?php if(empty($allExecutionsNum)):?>
<?php if(common::hasPriv('programplan', 'create') and $isStage):?>
<?php echo html::a($this->createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), "<i class='icon icon-plus'></i> " . $lang->programplan->create, '', "class='btn btn-info'");?>
<?php else: ?>