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

* Modify method name getProductsByProject to getProducts.

Browse Source
This commit is contained in:
holan20180123
2021-03-08 16:59:30 +08:00
parent f64e0a56c0
commit 158f6e482d
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+2 -2
View File
@@ -202,7 +202,7 @@ class product extends control
if($this->app->rawModule == 'projectstory')
{
$this->session->set('currentProductType', $product->type);
$projectProducts = $this->product->getProductsByProject($this->session->project);
$projectProducts = $this->product->getProducts($this->session->project);
$productPlans = $this->execution->getPlans($projectProducts);
if($browseType == 'bybranch') $param = $branch;
@@ -901,7 +901,7 @@ class product extends control
$moduleGroup = zget($this->lang->navGroup, $module);
$moduleGroup = in_array($moduleGroup, array('product', 'qa'))? $moduleGroup : 'project';
$products = $moduleGroup == 'project' ? $this->product->getProductsByProject($this->session->project) : $this->product->getList();
$products = $moduleGroup == 'project' ? $this->product->getProducts($this->session->project) : $this->product->getList();
$this->view->link = $this->product->getProductLink($module, $method, $extra);
$this->view->productID = $productID;
module/product/model.php
+3 -3
View File
@@ -303,7 +303,7 @@ class productModel extends model
*/
public function getProductPairsByProject($projectID, $status = 'all')
{
$products = empty($projectID) ? $this->getList() : $this->getProductsByProject($projectID, $status);
$products = empty($projectID) ? $this->getList() : $this->getProducts($projectID, $status);
$pairs = array();
if(!empty($products))
{
@@ -321,7 +321,7 @@ class productModel extends model
* @access public
* @return array
*/
public function getProductsByProject($projectID, $status = 'all')
public function getProducts($projectID, $status = 'all')
{
return $this->dao->select('t1.branch, t1.plan, t2.*')
->from(TABLE_PROJECTPRODUCT)->alias('t1')
@@ -378,7 +378,7 @@ class productModel extends model
$products = array();
if($projectID)
{
$pairs = $this->getProductsByProject($projectID);
$pairs = $this->getProducts($projectID);
$products = $this->getByIdList(array_keys($pairs));
}
else
module/project/control.php
+1 -1
View File
@@ -495,7 +495,7 @@ class project extends control
$this->app->session->set('projectBrowse', $this->app->getURI(true));
$products = $this->loadModel('product')->getProductsByProject($projectID);;
$products = $this->loadModel('product')->getProducts($projectID);;
$linkedBranches = array();
foreach($products as $product)
{
module/projectrelease/control.php
+1 -1
View File
@@ -71,7 +71,7 @@ class projectrelease extends control
$this->view->title = $execution->name . $this->lang->colon . $this->lang->release->browse;
$this->view->position[] = $this->lang->release->browse;
$this->view->execution = $execution;
$this->view->products = $this->loadModel('product')->getProductsByProject($this->session->project);
$this->view->products = $this->loadModel('product')->getProducts($this->session->project);
$this->view->releases = $this->projectrelease->getList($this->session->project, $type);
$this->view->type = $type;
$this->display();
module/story/control.php
+1 -1
View File
@@ -1413,7 +1413,7 @@ class story extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
$tracks = $this->story->getTracks($productID, $branch, $pager);
if($this->app->rawModule == 'projectstory') $projectProducts = $this->product->getProductsByProject($this->session->project);
if($this->app->rawModule == 'projectstory') $projectProducts = $this->product->getProducts($this->session->project);
$this->view->title = $this->lang->story->track;
$this->view->position[] = $this->lang->story->track;