Merge branch 'sprint/devops16_wangyidong_test' into 'master'

* code for bug #17438.

See merge request easycorp/zentaopms!915

module/execution/control.php

@@ -621,7 +621,24 @@ class execution extends control
         $this->config->bug->search['params']['plan']['values']    = $this->loadModel('productplan')->getPairs(array_keys($products));
         $this->config->bug->search['module'] = 'importBug';
         $this->config->bug->search['params']['confirmed']['values'] = array('' => '') + $this->lang->bug->confirmedList;
-        $this->config->bug->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($executionID, $viewType = 'bug', $startModuleID = 0);
+
+        $this->loadModel('tree');
+        $bugModules = array();
+        foreach($products as $productID => $productName)
+        {
+            $productModules = $this->tree->getOptionMenu($productID, 'bug', 0);
+            foreach($productModules as $moduleID => $moduleName)
+            {
+                if(empty($moduleID))
+                {
+                    $bugModules[$moduleID] = $moduleName;
+                    continue;
+                }
+                $bugModules[$moduleID] = $productName . $moduleName;
+            }
+        }
+        $this->config->bug->search['params']['module']['values'] = $bugModules;
+
         unset($this->config->bug->search['fields']['resolvedBy']);
         unset($this->config->bug->search['fields']['closedBy']);
         unset($this->config->bug->search['fields']['status']);

module/mr/model.php

@@ -924,6 +924,7 @@ class mrModel extends model
             ->get();
 
         $data->steps = $this->loadModel('file')->pasteImage($data->commentText, $this->post->uid);
+        if($data->execution) $data->project = (int)$this->dao->select('project')->from(TABLE_PROJECT)->where('id')->eq($data->execution)->fetch('project');
         if($data->assignedTo) $data->assignedDate = $now;
         unset($data->commentText);