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

Merge branch 'sprint/170' into 'sprint/170_tianshuejie_bug'

Browse Source 
# Conflicts:
#   module/execution/view/create.html.php
This commit is contained in:
孙广明
2021-11-18 06:03:46 +00:00
parent 7044ccbf2c 98a3b04e99
commit 8f2c87cae1
402 changed files with 32605 additions and 32295 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+26 -23
View File
@@ -99,7 +99,7 @@ class execution extends control
/* Get executions and products info. */
$executionID = $this->execution->saveState($executionID, $this->executions);
$execution = $this->execution->getById($executionID);
$products = $this->execution->getProducts($executionID);
$products = $this->product->getProducts($executionID);
$childExecutions = $this->execution->getChildExecutions($executionID);
$teamMembers = $this->execution->getTeamMembers($executionID);
$actions = $this->loadModel('action')->getList($this->objectType, $executionID);
@@ -746,7 +746,7 @@ class execution extends control
/* Build the search form. */
$modules = array();
$executionModules = $this->loadModel('tree')->getTaskTreeModules($executionID, true);
$products = $this->execution->getProducts($executionID);
$products = $this->product->getProducts($executionID);
foreach($products as $product)
{
$productModules = $this->tree->getOptionMenu($product->id);
@@ -864,8 +864,8 @@ class execution extends control
$queryID = ($type == 'bysearch') ? (int)$param : 0;
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
$products = $this->execution->getProducts($execution->id);
$branchID = isset($products[$productID]) ? $products[$productID]->branch : 0;
$products = $this->product->getProducts($execution->id);
$branchID = isset($products[$productID]) ? current($products[$productID]->branches) : 0;
$productPairs = array('0' => $this->lang->product->all);
foreach($products as $product) $productPairs[$product->id] = $product->name;
@@ -936,7 +936,7 @@ class execution extends control
$this->session->set('caseList', $uri, 'execution');
$this->session->set('bugList', $uri, 'execution');
$products = $this->execution->getProducts($executionID);
$products = $this->product->getProducts($executionID);
$productID = key($products); // Get the first product for creating testcase.
/* Load pager. */
@@ -999,7 +999,7 @@ class execution extends control
$executionID = $execution->id;
/* Get products' list. */
$products = $this->execution->getProducts($executionID, false);
$products = $this->product->getProducts($executionID, 'all', '', false);
$products = array('' => '') + $products;
/* Build the search form. */
@@ -1020,7 +1020,7 @@ class execution extends control
/* Set execution builds. */
$executionBuilds = array();
$productList = $this->execution->getProducts($executionID);
$productList = $this->product->getProducts($executionID);
if(!empty($builds))
{
foreach($builds as $build)
@@ -1282,7 +1282,7 @@ class execution extends control
$acl = $copyExecution->acl;
$whitelist = $copyExecution->whitelist;
$projectID = $copyExecution->project;
$products = $this->execution->getProducts($copyExecutionID);
$products = $this->loadModel('product')->getProducts($copyExecutionID);
$branches = $this->project->getBranchesByProject($copyExecutionID);
$plans = $this->loadModel('productplan')->getGroupByProduct(array_keys($products));
$branchGroups = $this->execution->getBranchByProduct(array_keys($products), $projectID);
@@ -1357,7 +1357,8 @@ class execution extends control
{
$this->lang->execution->type = str_replace($this->lang->executionCommon, $this->lang->project->stage, $this->lang->execution->type);
}
$this->loadModel('user');
$this->loadModel('user');
$poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', '', $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
@@ -1416,6 +1417,7 @@ class execution extends control
public function edit($executionID, $action = 'edit', $extra = '')
{
/* Load language files and get browseExecutionLink. */
$this->loadModel('product');
$this->app->loadLang('program');
$this->app->loadLang('stage');
$this->app->loadLang('programplan');
@@ -1424,7 +1426,7 @@ class execution extends control
if(!empty($_POST))
{
$oldPlans = $this->dao->select('plan')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($executionID)->andWhere('plan')->ne(0)->fetchPairs('plan');
$oldProducts = $this->execution->getProducts($executionID);
$oldProducts = $this->product->getProducts($executionID);
$changes = $this->execution->update($executionID);
if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -1439,7 +1441,7 @@ class execution extends control
}
$oldProducts = array_keys($oldProducts);
$newProducts = $this->execution->getProducts($executionID);
$newProducts = $this->product->getProducts($executionID);
$newProducts = array_keys($newProducts);
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
$products = $diffProducts ? join(',', $newProducts) : '';
@@ -1487,14 +1489,12 @@ class execution extends control
$position[] = html::a($browseExecutionLink, $execution->name);
$position[] = $this->lang->execution->edit;
$allProducts = array(0 => '');
$executionProsucts = $this->execution->getProducts($execution->project, true, 'noclosed');
foreach($executionProsucts as $product) $allProducts[$product->id] = $product->name;
$allProducts = array(0 => '') + $this->product->getProducts($execution->project, 'noclosed', '', false);
$this->loadModel('productplan');
$productPlans = array(0 => '');
$linkedBranches = array();
$linkedProducts = $this->execution->getProducts($executionID);
$linkedProducts = $this->product->getProducts($executionID);
$branches = $this->project->getBranchesByProject($executionID);
$plans = $this->productplan->getGroupByProduct(array_keys($linkedProducts));
$executionStories = $this->project->getStoriesByProject($executionID);
@@ -1547,7 +1547,7 @@ class execution extends control
$this->view->branches = $branches;
$this->view->unmodifiableProducts = $unmodifiableProducts;
$this->view->unmodifiableBranches = $unmodifiableBranches;
$this->view->multiBranchProducts = $this->loadModel('product')->getMultiBranchPairs();
$this->view->multiBranchProducts = $this->product->getMultiBranchPairs();
$this->view->productPlans = $productPlans;
$this->view->branchGroups = $this->execution->getBranchByProduct(array_keys($linkedProducts), $execution->project);
$this->display();
@@ -1829,11 +1829,14 @@ class execution extends control
/* Execution not found to prevent searching for .*/
if(!isset($this->executions[$execution->id])) $this->executions = $this->execution->getPairs($execution->project, 'all', 'nocode');
$products = $this->execution->getProducts($execution->id);
$products = $this->loadModel('product')->getProducts($execution->id);
$linkedBranches = array();
foreach($products as $product)
{
if($product->branch) $linkedBranches[$product->branch] = $product->branch;
if(isset($product->branches))
{
foreach($product->branches as $branchID) $linkedBranches[$branchID] = $branchID;
}
}
/* Set menu. */
@@ -2246,7 +2249,7 @@ class execution extends control
if(count($_POST['products']) > 1) die(js::alert($this->lang->execution->oneProduct) . js::locate($this->createLink('execution', 'manageProducts', "executionID=$executionID&from=$from")));
}
$oldProducts = $this->execution->getProducts($executionID);
$oldProducts = $this->product->getProducts($executionID);
if($from == 'buildCreate' && $this->session->buildCreate) $browseExecutionLink = $this->session->buildCreate;
@@ -2254,7 +2257,7 @@ class execution extends control
if(dao::isError()) die(js::error(dao::getError()));
$oldProducts = array_keys($oldProducts);
$newProducts = $this->execution->getProducts($executionID);
$newProducts = $this->product->getProducts($executionID);
$newProducts = array_keys($newProducts);
$diffProducts = array_merge(array_diff($oldProducts, $newProducts), array_diff($newProducts, $oldProducts));
if($diffProducts) $this->loadModel('action')->create($this->objectType, $executionID, 'Managed', '', !empty($_POST['products']) ? join(',', $_POST['products']) : '');
@@ -2275,7 +2278,7 @@ class execution extends control
$position[] = $this->lang->execution->manageProducts;
$allProducts = $this->config->systemMode == 'classic' ? $this->product->getPairs('noclosed') : $this->product->getProductPairsByProject($execution->project);
$linkedProducts = $this->execution->getProducts($execution->id);
$linkedProducts = $this->product->getProducts($execution->id);
$linkedBranches = array();
$branches = $this->project->getBranchesByProject($executionID);
$executionStories = $this->project->getStoriesByProject($executionID);
@@ -2432,7 +2435,7 @@ class execution extends control
/* Get projects, executions and products. */
$object = $this->project->getByID($objectID, $this->app->tab == 'project' ? 'project' : 'sprint,stage');
$products = $this->project->getProducts($objectID);
$products = $this->product->getProducts($objectID);
$browseLink = $this->createLink($this->app->tab == 'project' ? 'projectstory' : 'execution', 'story', "objectID=$objectID");
$this->session->set('storyList', $this->app->getURI(true), $this->app->tab); // Save session.
@@ -2682,7 +2685,7 @@ class execution extends control
*/
public function ajaxGetProducts($executionID)
{
$products = $this->execution->getProducts($executionID, false);
$products = $this->loadModel('product')->getProducts($executionID, 'all', '', false);
die(html::select('product', $products, '', 'class="form-control"'));
}