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

Merge branch 'master' into 'sprint/174_tianshujie_45081'

Browse Source 
# Conflicts:
#   module/product/control.php
#   module/story/view/batchedit.html.php
This commit is contained in:
李玉春
2021-11-29 08:03:38 +00:00
parent adb2c12935 3050ba859d
commit a99419f0c5
109 changed files with 1292 additions and 485 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testtask/control.php
+3 -2
View File
@@ -152,7 +152,7 @@ class testtask extends control
* @access public
* @return void
*/
public function browseUnits($productID = 0, $browseType = 'newest', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
public function browseUnits($productID = 0, $browseType = 'newest', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
{
/* Save session. */
$this->session->set('testtaskList', $this->app->getURI(true), 'qa');
@@ -175,7 +175,7 @@ class testtask extends control
}
$this->loadModel('project')->setMenu($this->session->project);
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits');
$this->lang->modulePageNav = $this->product->select($this->products, $productID, 'testtask', 'browseUnits', "projectID=$projectID");
}
else
{
@@ -194,6 +194,7 @@ class testtask extends control
$this->view->title = $this->products[$productID] . $this->lang->colon . $this->lang->testtask->common;
$this->view->position[] = html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->testtask->common;
$this->view->projectID = $projectID;
$this->view->productID = $productID;
$this->view->productName = $this->products[$productID];
$this->view->orderBy = $orderBy;