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

* Resolve feedback #1335.

Browse Source
This commit is contained in:
liuyongkai
2022-11-03 14:26:48 +08:00
parent 5827759d8b
commit d53024dba9
3 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+4 -4
View File
@@ -3289,23 +3289,23 @@ class execution extends control
* @access public
* @return void
*/
public function unlinkStory($executionID, $storyID, $confirm = 'no', $from = '')
public function unlinkStory($executionID, $storyID, $confirm = 'no', $from = '', $laneID = 0, $columnID = 0)
{
if($confirm == 'no')
{
$tip = $this->app->rawModule == 'projectstory' ? $this->lang->execution->confirmUnlinkExecutionStory : $this->lang->execution->confirmUnlinkStory;
return print(js::confirm($tip, $this->createLink('execution', 'unlinkstory', "executionID=$executionID&storyID=$storyID&confirm=yes&from=$from")));
return print(js::confirm($tip, $this->createLink('execution', 'unlinkstory', "executionID=$executionID&storyID=$storyID&confirm=yes&from=$from&laneID=$laneID&columnID=$columnID")));
}
else
{
$execution = $this->execution->getByID($executionID);
$this->execution->unlinkStory($executionID, $storyID);
$this->execution->unlinkStory($executionID, $storyID, $laneID, $columnID);
if($execution->type == 'kanban')
{
/* Fix bug #29171. */
$executions = $this->dao->select('*')->from(TABLE_EXECUTION)->where('parent')->eq($execution->parent)->fetchAll('id');
$executionStories = $this->dao->select('project,story')->from(TABLE_PROJECTSTORY)->where('story')->eq($storyID)->andWhere('project')->in(array_keys($executions))->fetchAll();
if(empty($executionStories)) $this->execution->unlinkStory($execution->parent, $storyID);
if(empty($executionStories)) $this->execution->unlinkStory($execution->parent, $storyID, $laneID, $columnID);
}
/* if kanban then reload and if ajax request then send result. */