Merge branch 'sprint/231_dongli_64972' into 'master'

* Fix bug #26824.

See merge request easycorp/zentaopms!5099

module/action/control.php

@@ -125,7 +125,7 @@ class action extends control
         }
 
         /* Get the products name of story. */
-        if($browseType == 'story')
+        if(strpos(',story,requirement,', ",$browseType,") !== false)
         {
             $this->loadModel('story');
             $storyIdList = array();

module/action/view/trash.html.php

@@ -85,7 +85,7 @@
           <?php if($config->systemMode == 'new' and $currentObjectType == 'execution'):?>
           <th class='w-250px'><?php echo $this->lang->project->project;?></th>
           <?php endif;?>
-          <?php if($currentObjectType == 'story'):?>
+          <?php if(strpos(',story,requirement,', ",$currentObjectType,") !== false):?>
           <th class='w-250px'><?php echo $this->lang->story->product;?></th>
           <?php endif;?>
           <?php if($currentObjectType == 'task'):?>
@@ -154,7 +154,7 @@
             <?php endif;?>
           </td>
           <?php endif;?>
-          <?php if($currentObjectType == 'story'):?>
+          <?php if(strpos(',story,requirement,', ",$currentObjectType,") !== false):?>
           <td class="c-name flex" title="<?php echo $productList[$action->objectID]->productTitle;?>">
             <span class="text-ellipsis"><?php echo $productList[$action->objectID]->productTitle;?></span>
             <?php if($productList[$action->objectID]->productDeleted):?>

module/my/model.php

@@ -507,7 +507,6 @@ class myModel extends model
     {
         $rawMethod = $this->app->rawMethod;
         $this->loadModel('execution');
-        $this->app->loadConfig('execution');
 
         $this->config->execution->search['module']    = $rawMethod . 'Task';
         $this->config->execution->search['actionURL'] = $actionURL;