diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 3c6308c27d..34fae9109f 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -165,8 +165,8 @@ $lang->product->menu->home = '主页|product|index|'; $lang->product->menu->list = array('link' => $lang->productCommon . '|product|all|', 'alias' => 'create,batchedit'); $lang->product->viewMenu = new stdclass(); -$lang->product->viewMenu->requirement = array('link' => "$URCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); -$lang->product->viewMenu->story = array('link' => "$SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); +if($config->URAndSR) $lang->product->viewMenu->requirement = array('link' => "$URCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story'); +$lang->product->viewMenu->story = array('link' => "$lang->storyCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story'); $lang->product->viewMenu->plan = array('link' => "计划|productplan|browse|productID=%s", 'subModule' => 'productplan'); $lang->product->viewMenu->release = array('link' => '发布|release|browse|productID=%s', 'subModule' => 'release'); $lang->product->viewMenu->roadmap = '路线图|product|roadmap|productID=%s'; @@ -175,6 +175,7 @@ $lang->product->viewMenu->module = '模块|tree|browse|productID=%s&view=st $lang->product->viewMenu->view = array('link' => '概况|product|view|productID=%s', 'alias' => 'edit'); $lang->product->viewMenu->whitelist = array('link' => '白名单|product|whitelist|productID=%s', 'alias' => 'addwhitelist'); + $lang->release = new stdclass(); $lang->branch = new stdclass(); $lang->productplan = new stdclass(); diff --git a/module/upgrade/view/mergebyline.html.php b/module/upgrade/view/mergebyline.html.php index 6af410d99d..00a73985b0 100644 --- a/module/upgrade/view/mergebyline.html.php +++ b/module/upgrade/view/mergebyline.html.php @@ -41,7 +41,7 @@ id][$productID]", $productID);?>
-
+
id][$productID]", array($sprint->id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $i == 0 ? $sprint->id : 0, "data-product='{$product->id}' data-line='{$line->id}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?> diff --git a/module/upgrade/view/mergebyproduct.html.php b/module/upgrade/view/mergebyproduct.html.php index 580d062915..a062ec39f7 100644 --- a/module/upgrade/view/mergebyproduct.html.php +++ b/module/upgrade/view/mergebyproduct.html.php @@ -19,7 +19,7 @@ id => "{$lang->productCommon} #{$product->id} {$product->name}"), $product->id, "data-productid='{$product->id}' data-begin='{$product->createdDate}'");?>
-
+
id => "{$lang->upgrade->project} #{$sprint->id} {$sprint->name}"), $sprint->id, "data-product='{$productID}' data-begin='{$sprint->begin}' data-end='{$sprint->end}'");?>