Merge branch 'sprint/239_liuruogu_bug' into 'zentaopms_239'

* Fix bug #27665 and hidden product menu.

See merge request easycorp/zentaopms!5455

module/execution/model.php

@@ -120,6 +120,8 @@ class executionModel extends model
             $this->cookie->executionMode = 'all';
         }
 
+        if(empty($execution->hasProduct)) unset($this->lang->execution->menu->settings['subMenu']->products);
+
         $this->lang->switcherMenu = $this->getSwitcher($executionID, $this->app->rawModule, $this->app->rawMethod);
         common::setMenuVars('execution', $executionID);
     }

module/story/control.php

@@ -2229,6 +2229,7 @@ class story extends control
         $story    = $this->story->getById($storyID);
         $products = $this->product->getPairs('', 0, '', true);
         $queryID  = 0;
+        $product  = $this->product->getByID($story->product);
 
         /* Change for requirement story title. */
         if($story->type == 'story')
@@ -2244,6 +2245,8 @@ class story extends control
             $this->lang->story->title = str_replace($this->lang->URCommon, $this->lang->SRCommon, $this->lang->story->title);
         }
 
+        if(!empty($product->shadow)) unset($this->config->product->search['fields']['product']);
+
         /* Build search form. */
         $actionURL = $this->createLink('story', 'linkStory', "storyID=$storyID&type=$type&linkedStoryID=$linkedStoryID&browseType=bySearch&queryID=myQueryID&storyType=$storyType", '', true);
         $this->product->buildSearchForm($story->product, $products, $queryID, $actionURL);

module/story/view/view.html.php

@@ -56,7 +56,7 @@
     if($this->app->rawModule == 'projectstory')
     {
         $otherParam = "storyID=&projectID={$this->session->project}";
-        $openGroup  = 'project';
+        $tab        = 'project';
     }
     ?>
     <?php common::printLink('story', 'create', "productID={$story->product}&branch={$story->branch}&moduleID={$story->module}&$otherParam&bugID=0&planID=0&todoID=0&extra=&type=$story->type", "<i class='icon icon-plus'></i> " . $lang->story->create, '', "class='btn btn-primary' data-app='$tab'"); ?>