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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source 
*edit
This commit is contained in:
tengfei
2016-12-22 10:44:27 +08:00
parent 5c47dc0301 aabbc9b17c
commit aa4ff18fc4
20 changed files with 107 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+3 -2
View File
@@ -151,11 +151,12 @@ class bug extends control
*
* @param int $productID
* @param string $browseType
* @param int $branchID
* @param int $moduleID
* @access public
* @return void
*/
public function report($productID, $browseType, $moduleID)
public function report($productID, $browseType, $branchID, $moduleID)
{
$this->loadModel('report');
$this->view->charts = array();
@@ -174,7 +175,7 @@ class bug extends control
}
}
$this->bug->setMenu($this->products, $productID);
$this->bug->setMenu($this->products, $productID, $branchID);
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->common . $this->lang->colon . $this->lang->bug->reportChart;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->reportChart;
module/bug/view/browse.html.php
+1 -1
View File
@@ -58,7 +58,7 @@ js::set('bugBrowseType', ($browseType == 'bymodule' and $this->session->bugBrows
</ul>
</div>
<div class='btn-group'>
<?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&moduleID=$moduleID"); ?>
<?php common::printIcon('bug', 'report', "productID=$productID&browseType=$browseType&branchID=$branch&moduleID=$moduleID"); ?>
</div>
</div>
<div class='btn-group'>