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

* Fix bug #29840.

Browse Source
This commit is contained in:
wangyuting
2022-11-16 01:13:08 +00:00
parent 6fc2d1bd23
commit b441fd0a4c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/build/model.php
+9 -9
View File
@@ -568,25 +568,25 @@ class buildModel extends model
* Bugs and stories associated with child builds.
*
* @param int $buildID
* @param string $childBuilds
* @param string $childBuildIDList
* @access public
* @return void
*/
public function linkChildBuilds($buildID, $childBuilds)
public function linkChildBuilds($buildID, $childBuildIDList)
{
$build = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
$buildList = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuilds)->fetchAll();
$build = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->eq($buildID)->fetch();
$childBuilds = $this->dao->select('bugs, stories')->from(TABLE_BUILD)->where('id')->in($childBuildIDList)->fetchAll();
foreach($buildList as $buildInfo)
foreach($childBuilds as $childBuild)
{
if($buildInfo->bugs) $build->bugs .= ",{$buildInfo->bugs}";
if($buildInfo->stories) $build->stories .= ",{$buildInfo->stories}";
if($childBuild->bugs) $build->bugs .= ",{$childBuild->bugs}";
if($childBuild->stories) $build->stories .= ",{$childBuild->stories}";
}
$build->bugs = explode(',', $build->bugs);
$build->bugs = join(',', array_filter($build->bugs));
$build->bugs = join(',', array_unique(array_filter($build->bugs)));
$build->stories = explode(',', $build->stories);
$build->stories = join(',', array_filter($build->stories));
$build->stories = join(',', array_unique(array_filter($build->stories)));
$this->dao->update(TABLE_BUILD)->data($build)->where('id')->eq($buildID)->exec();
}
module/product/view/all.html.php
+1 -1
View File
@@ -248,7 +248,7 @@
<?php if(!empty($product) and $canBatchEdit):?>
<div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
<?php
$summary = empty($productLines) ? sprintf($lang->product->pageSummary, count($productStats)) : sprintf($lang->product->lineSummary, count($lineNames), count($productStats));
$summary = (empty($productLines) or $this->config->systemMode == 'light') ? sprintf($lang->product->pageSummary, count($productStats)) : sprintf($lang->product->lineSummary, count($lineNames), count($productStats));
echo "<div id='productsCount' class='statistic'>$summary</div>";
?>
<div class="table-actions btn-toolbar">