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

* Finish task #6386.

Browse Source
This commit is contained in:
Yagami
2019-10-10 11:26:32 +08:00
parent fe47c0600a
commit 59af2053bc
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+13 -1
View File
@@ -713,8 +713,20 @@ class block extends control
$pager = pager::init(0, $num , 1);
$productStats = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
$projects = $this->loadModel('project')->getPairs();
$productIdList = array();
foreach($productStats as $product) $productIdList[] = $product->id;
$this->loadModel('action');
foreach($productStats as $product)
{
$currentProjectID = $this->dao->select('objectID')->from(TABLE_ACTION)
->where('objectType')->eq('project')
->andWhere('action')->eq('managed')
->andWhere("CONCAT(extra, ',,')")->like("%$product->id,,")
->orderBy('id_desc')
->fetch('objectID');
$product->currentProject = zget($projects, $currentProjectID, '');
$productIdList[] = $product->id;
}
$this->view->projects = $this->dao->select('t1.product,t2.name')->from(TABLE_PROJECTPRODUCT)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
module/block/view/productblock.html.php
+2 -2
View File
@@ -39,8 +39,8 @@
<tr class='text-center' data-url='<?php echo empty($sso) ? $viewLink : $sso . $sign . 'referer=' . base64_encode($viewLink); ?>' <?php echo $appid?>>
<td class='c-name text-left' title='<?php echo $product->name?>'><?php echo $product->name?></td>
<?php if($longBlock):?>
<?php $projectName = zget($projects, $product->id, '');?>
<td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo zget($projects, $product->id, '');?></td>
<?php $projectName = $product->currentProject ? $product->currentProject : zget($projects, $product->id, '');?>
<td class='c-name c-project text-left' title='<?php echo $projectName;?>'><?php echo $projectName;?></td>
<?php endif;?>
<td class="c-num"><?php echo $product->plans?></td>
<td class="c-num"><?php echo $product->releases?></td>