diff --git a/config/zentaopms.php b/config/zentaopms.php index c266a74615..2a88b990e5 100644 --- a/config/zentaopms.php +++ b/config/zentaopms.php @@ -12,16 +12,11 @@ /* Product common list. */ $config->productCommonList['zh-cn'][0] = '产品'; - $config->productCommonList['zh-tw'][0] = '產品'; - -$config->productCommonList['en'][0] = 'Product'; - -$config->productCommonList['de'][0] = 'Produkt'; - -$config->productCommonList['fr'][0] = 'Product'; - -$config->productCommonList['vi'][0] = 'Sản phẩm'; +$config->productCommonList['en'][0] = 'Product'; +$config->productCommonList['de'][0] = 'Produkt'; +$config->productCommonList['fr'][0] = 'Product'; +$config->productCommonList['vi'][0] = 'Sản phẩm'; /* Project common list. */ $config->projectCommonList['zh-cn'][0] = '迭代'; diff --git a/module/doc/view/index.html.php b/module/doc/view/index.html.php index af82294b8c..5c497bf2cf 100644 --- a/module/doc/view/index.html.php +++ b/module/doc/view/index.html.php @@ -141,7 +141,7 @@ - id}&programID=$programID")?>"> + id}")?>"> name;?> begin);?> end);?> diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php index 8130929377..f2d940ea7c 100644 --- a/module/doc/view/side.html.php +++ b/module/doc/view/side.html.php @@ -1,6 +1,6 @@ doclib->tabList as $libType => $typeName) $sideLibs[$libType] = $this->doc->getLimitLibs($libType, 0, $this->session->PRJ); +foreach($lang->doclib->tabList as $libType => $typeName) $sideLibs[$libType] = $this->doc->getLimitLibs($libType); $allModules = $this->loadModel('tree')->getDocStructure(); $sideSubLibs = array(); diff --git a/module/product/model.php b/module/product/model.php index e646553f36..78ee5a09c7 100644 --- a/module/product/model.php +++ b/module/product/model.php @@ -367,7 +367,7 @@ class productModel extends model $products = array(); if($projectID) { - $pairs = $this->getProductsByProject($this->session->PRJ); + $pairs = $this->getProductsByProject($projectID); $products = $this->getByIdList(array_keys($pairs)); } else diff --git a/module/program/model.php b/module/program/model.php index dc518aba0e..63e3b4de03 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -959,9 +959,9 @@ class programModel extends model } /** - * Get project name. + * Get project pairs. * - * @param int $projectID + * @param int $programID * @access public * @return object */