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

Merge branch 'pailei_zhangzilong_49888' into 'pailei2'

Browse Source 
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
This commit is contained in:
孙广明
2022-03-09 06:41:53 +00:00
parent aa15a88a2c 4ba238cd27
commit 4c218d7a69
24 changed files with 411 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/model.php
+9 -2
View File
@@ -2269,11 +2269,12 @@ class executionModel extends model
* @param array $stories
* @param array $products
* @param string $extra
* @param array $lanes
*
* @access public
* @return bool
*/
public function linkStory($executionID, $stories = array(), $products = array(), $extra = '')
public function linkStory($executionID, $stories = array(), $products = array(), $extra = '', $lanes = array())
{
if(empty($executionID)) return false;
if(empty($stories)) $stories = $this->post->stories;
@@ -2296,7 +2297,13 @@ class executionModel extends model
if(strpos($notAllowedStatus, $storyList[$storyID]->status) !== false) continue;
if(isset($linkedStories[$storyID])) continue;
if(isset($output['laneID']) and isset($output['columnID'])) $this->kanban->addKanbanCell($executionID, $output['laneID'], $output['columnID'], 'story', $storyID);
$laneID = isset($output['laneID']) ? $output['laneID'] : 0;
if(!empty($lanes[$storyID])) $laneID = $lanes[$storyID];
$columnID = $this->kanban->getColumnIDByLaneID($laneID, 'backlog');
if(empty($columnID)) $columnID = isset($output['columnID']) ? $output['columnID'] : 0;
if(!empty($laneID) and !empty($columnID)) $this->kanban->addKanbanCell($executionID, $laneID, $columnID, 'story', $storyID);
$data = new stdclass();
$data->project = $executionID;