Merge branch 'hufangzhou_bug_33080' into 'master'
* Fix bug #33080. See merge request easycorp/zentaopms!7233
This commit is contained in:
@@ -1903,9 +1903,6 @@ class story extends control
|
||||
|
||||
$this->story->replaceURLang($story->type);
|
||||
|
||||
/* Set menu. */
|
||||
$this->product->setMenu($product->id, $story->branch);
|
||||
|
||||
/* Set the closed reason options and remove subdivided options. */
|
||||
$reasonList = $this->lang->story->reasonList;
|
||||
if($story->status == 'draft') unset($reasonList['cancel']);
|
||||
@@ -2327,9 +2324,6 @@ class story extends control
|
||||
$products = $this->product->getPairs();
|
||||
$product = $this->product->getById($story->product);
|
||||
|
||||
/* Set menu. */
|
||||
$this->product->setMenu($story->product, $story->branch);
|
||||
|
||||
$this->view->title = zget($products, $story->product, '') . $this->lang->colon . $this->lang->story->assign;
|
||||
$this->view->position[] = $this->lang->story->assign;
|
||||
$this->view->story = $story;
|
||||
|
||||
Reference in New Issue
Block a user