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

* code for task#1888.

Browse Source
This commit is contained in:
xia0ta0
2014-06-17 15:26:05 +08:00
parent 17838c114a
commit 6696901714
4 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+3 -2
View File
@@ -213,12 +213,13 @@ class bugModel extends model
/**
* getActiveBugs
*
* @param object $pager
* @param array $products
* @param int $projectID
* @param object $pager
* @access public
* @return array
*/
public function getActiveBugs($pager, $projectID, $products)
public function getActiveBugs($products, $projectID, $pager = null)
{
return $this->dao->select('*')->from(TABLE_BUG)
->where('status')->eq('active')
module/productplan/control.php
+1 -1
View File
@@ -352,7 +352,7 @@ class productplan extends control
{
$projects = $this->loadModel('project')->getPairs();
$projects[0] = '';
$allBugs= $this->loadModel('bug')->getAllBugs($this->view->product->id, $projects, 'id_desc');
$allBugs= $this->bug->getActiveBugs($this->view->product->id, $projects);
}
$this->view->title = $plan->title . $this->lang->colon . $this->lang->productplan->linkBug;
module/productplan/view/linkbug.html.php
+1 -3
View File
@@ -30,7 +30,6 @@
<tr class='colhead'>
<th class='w-id {sorter:"currency"}'><?php echo $lang->idAB;?></th>
<th class='w-pri'> <?php echo $lang->priAB;?></th>
<th class='w-200px'> <?php echo $lang->bug->plan;?></th>
<th> <?php echo $lang->bug->title;?></th>
<th class='w-user'> <?php echo $lang->openedByAB;?></th>
<th class='w-user'> <?php echo $lang->assignedToAB;?></th>
@@ -49,7 +48,6 @@
<?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->id);?>
</td>
<td><span class='<?php echo 'pri' . $bug->pri;?>'><?php echo $bug->pri?></span></td>
<td><?php echo $bug->planTitle;?></td>
<td class='text-left nobr'><?php echo html::a($this->createLink('bug', 'view', "bugID=$bug->id"), $bug->title);?></td>
<td><?php echo $users[$bug->openedBy];?></td>
<td><?php echo $users[$bug->assignedTo];?></td>
@@ -59,7 +57,7 @@
</tbody>
<tfoot>
<tr>
<td colspan='7' class='text-left'>
<td colspan='6' class='text-left'>
<?php if(count($allBugs)) echo "<div class='table-actions clearfix'><div class='btn-group'>" . html::selectAll('unlinkedBugsForm') . html::selectReverse('unlinkedBugsForm') . '</div>' . html::submitButton($lang->productplan->linkBug) . '</div>';?>
</td>
</tr>
module/project/control.php
+1 -1
View File
@@ -417,7 +417,7 @@ class project extends control
$bugs = array();
if($browseType != "bysearch")
{
$bugs = $this->bug->getActiveBugs($pager, $projectID, array_keys($products));
$bugs = $this->bug->getActiveBugs(array_keys($products), $projectID, $pager);
}
else
{