Merge branch 'sprint/devops16_17345' into 'sprint/devops16'

* Fix bug#17345 See merge request easycorp/zentaopms!890
2021-12-13 03:26:13 +00:00
parent e0b7453fb8 03a729542c
commit fbe7f981ab
1 changed files with 6 additions and 0 deletions
@@ -233,6 +233,12 @@ class actionModel extends model
                $record->execution = (int)$extra;
            }

+            if($objectType == 'story' and $actionType == 'importfromgitlab')
+            {
+                $record->execution = $record->project;
+                $record->project   = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($record->execution)->fetch('project');
+            }
+
            if($objectType == 'case' and (strpos(',linked2testtask,unlinkedfromtesttask,assigned,run,', ',' . $actionType . ',') !== false) and (int)$extra)
            {
                $testtask = $this->dao->select('project,execution')->from(TABLE_TESTTASK)->where('id')->eq((int)$extra)->fetch();