* adjust code and fix bug.

This commit is contained in:
wangyidong
2015-11-20 10:45:18 +08:00
parent 7374c81949
commit c657433fa2
8 changed files with 15 additions and 14 deletions
+3 -3
View File
@@ -286,7 +286,7 @@ class story extends control
$moduleOptionMenu = $this->tree->getOptionMenu($product->id, $viewType = 'story', 0, $story->branch);
/* Set menu. */
$this->product->setMenu($products, $product->id);
$this->product->setMenu($products, $product->id, $story->branch);
/* Assign. */
$this->view->position[] = html::a($this->createLink('product', 'browse', "product=$product->id&branch=$story->branch"), $product->name);
@@ -609,7 +609,7 @@ class story extends control
$product = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fields('name, id')->fetch();
/* Set menu. */
$this->product->setMenu($this->product->getPairs(), $product->id);
$this->product->setMenu($this->product->getPairs(), $product->id, $story->branch);
/* Set the review result options. */
if($story->status == 'draft' and $story->version == 1) unset($this->lang->story->reviewResultList['revert']);
@@ -678,7 +678,7 @@ class story extends control
$product = $this->dao->findById($story->product)->from(TABLE_PRODUCT)->fields('name, id')->fetch();
/* Set menu. */
$this->product->setMenu($this->product->getPairs(), $product->id);
$this->product->setMenu($this->product->getPairs(), $product->id, $story->branch);
/* Set the closed reason options. */
if($story->status == 'draft') unset($this->lang->story->reasonList['cancel']);