diff --git a/trunk/module/story/control.php b/trunk/module/story/control.php index e62297e118..e556191d09 100644 --- a/trunk/module/story/control.php +++ b/trunk/module/story/control.php @@ -51,6 +51,9 @@ class story extends control $users = $this->user->getPairs(); $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'product'); + /* 设置菜单。*/ + $this->product->setMenu($products, $product->id); + $header['title'] = $product->name . $this->lang->colon . $this->lang->story->create; $position[] = html::a($this->createLink('product', 'browse', "product=$productID"), $product->name); $position[] = $this->lang->story->create; @@ -82,12 +85,16 @@ class story extends control die(js::locate($this->createLink('story', 'view', "storyID=$storyID"), 'parent')); } + $story = $this->story->findByID($storyID); $product = $this->product->findByID($story->product); $products = $this->product->getPairs(); $users = $this->user->getPairs(); $moduleOptionMenu = $this->tree->getOptionMenu($product->id, $viewType = 'product'); + /* 设置菜单。*/ + $this->product->setMenu($products, $product->id); + $header['title'] = $product->name . $this->lang->colon . $this->lang->story->edit . $this->lang->colon . $story->title; $position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name); $position[] = $this->lang->story->edit; @@ -112,6 +119,9 @@ class story extends control $modulePath = $this->tree->getParents($story->module); $users = $this->user->getPairs(); + /* 设置菜单。*/ + $this->product->setMenu($this->product->getPairs(), $product->id); + $header['title'] = $product->name . $this->lang->colon . $this->lang->story->view . $this->lang->colon . $story->title; $position[] = html::a($this->createLink('product', 'browse', "product=$product->id"), $product->name); $position[] = $this->lang->story->view; diff --git a/trunk/module/story/view/edit.html.php b/trunk/module/story/view/edit.html.php index 915e34a2ec..4270e579f6 100644 --- a/trunk/module/story/view/edit.html.php +++ b/trunk/module/story/view/edit.html.php @@ -30,9 +30,9 @@ function loadModuleMenu(productID) $('#moduleIdBox').load(link); } -
+
- +
@@ -82,10 +82,7 @@ function loadModuleMenu(productID) - +
story->edit;?>
story->product;?>
- - -
diff --git a/trunk/module/story/view/view.html.php b/trunk/module/story/view/view.html.php index 4c15976e23..54f438a28d 100644 --- a/trunk/module/story/view/view.html.php +++ b/trunk/module/story/view/view.html.php @@ -40,147 +40,139 @@
-
-
- -
+
+
+
- story->legendBasicInfo;?> - - - - - - - - - - - - - - - - - - - - - - - - - - - -
story->labProductAndModule;?> - name; - if(!empty($modulePath)) echo $lang->arrow; - foreach($modulePath as $key => $module) - { - echo $module->name; - if(isset($modulePath[$key + 1])) echo $lang->arrow; - } - ?> -
story->status;?>show($lang->story->statusList, $story->status);?>
story->assignedTo;?>assignedTo];?>
story->assignedDate;?>assignedDate;?>
story->lastEditedBy;?>lastEditedBy];?>
story->lastEditedDate;?>lastEditedDate;?>
+ story->legendSpec;?> +
spec);?>
- +
- story->legendMailto;?> -
+ story->legendAction;?> +
+ createLink('story', 'edit', "storyID=$story->id"), $lang->story->buttonEdit); + if(common::hasPriv('product', 'browse')) + { + if($app->session->storyList != '') echo html::a($app->session->storyList, $lang->story->buttonToList); + else echo html::a($this->createLink('product', 'browse', "productID=$story->product&moduleID=$story->module"), $lang->story->buttonToList); + } + ?> +
- -
- story->legendAttatch;?> -
 
-
- -
- -
-
- story->legendOpenInfo;?> - - - - - - - - - -
story->openedBy;?>openedBy];?>
story->openedDate;?>openedDate;?>
-
- -
- story->legendProjectAndTask;?> - - - - - - - - - -
story->project;?>project;?>
story->tasks;?>tasks;?>
-
- - - -
- story->legendLinkBugs;?> -
 
-
- -
- story->legendCases;?> -
 
-
- -
-
-
- -
-
- story->legendAction;?> -
- createLink('story', 'edit', "storyID=$story->id"), $lang->story->buttonEdit); - if(common::hasPriv('product', 'browse')) - { - if($app->session->storyList != '') echo html::a($app->session->storyList, $lang->story->buttonToList); - else echo html::a($this->createLink('product', 'browse', "productID=$story->product&moduleID=$story->module"), $lang->story->buttonToList); - } - ?>
-
-
- story->legendSpec;?> -
spec);?>
-
- +
+
+
+ story->legendBasicInfo;?> + + + + + + + + + + + + + + + + + + + + + + + + + + + +
story->labProductAndModule;?> + name; + if(!empty($modulePath)) echo $lang->arrow; + foreach($modulePath as $key => $module) + { + echo $module->name; + if(isset($modulePath[$key + 1])) echo $lang->arrow; + } + ?> +
story->status;?>show($lang->story->statusList, $story->status);?>
story->assignedTo;?>assignedTo];?>
story->assignedDate;?>assignedDate;?>
story->lastEditedBy;?>lastEditedBy];?>
story->lastEditedDate;?>lastEditedDate;?>
+
+
+ story->legendMailto;?> +
+
+ +
+ story->legendAttatch;?> +
 
+
+
+ story->legendOpenInfo;?> + + + + + + + + + +
story->openedBy;?>openedBy];?>
story->openedDate;?>openedDate;?>
+
+ +
+ story->legendProjectAndTask;?> + + + + + + + + + +
story->project;?>project;?>
story->tasks;?>tasks;?>
+
+ + + +
+ story->legendLinkBugs;?> +
 
+
+ +
+ story->legendCases;?> +
 
+
+