* Fix product menu.

module/common/lang/zh-cn.php

@@ -142,23 +142,10 @@ $lang->program->viewMenu->view    = '概况|program|pgmview|program=%s';
 $lang->program->viewMenu->product = array('link' => '产品|program|pgmproduct|program=%s');
 $lang->program->viewMenu->project = array('link' => "$lang->projectCommon|program|pgmproject|program=%s");
 
-/* Product menu. */
-$lang->productlist = new stdclass();
-$lang->productlist->menu = new stdclass();
-$lang->productlist->menu->productlist = '产品|product|productlist|';
-
-/* Project menu. */
-$lang->projectlist = new stdclass();
-$lang->projectlist->menu = new stdclass();
-$lang->projectlist->menu->projectlist = '项目|project|projectlist|';
-
 /* Scrum menu. */
 $lang->menu = new stdclass();
-$lang->menu->program = '仪表盘|program|index|';
-$lang->menu->product = $lang->productCommon . '|product|index|locate=no';
-$lang->menu->project = "$lang->projectCommon|project|index|locate=no";
-$lang->menu->doc     = '文档|doc|index|';
-$lang->menu->qa      = '测试|qa|index';
+$lang->menu->productindex = '主页|product|index|';
+$lang->menu->product      = $lang->productCommon . '|product|productlist|';
 
 /* System menu. */
 $lang->system = new stdclass();
@@ -568,9 +555,6 @@ $lang->navGroup->my     = 'my';
 $lang->navGroup->todo   = 'my';
 $lang->navGroup->effort = 'my';
 
-$lang->navGroup->product     = 'product';
-$lang->navGroup->project     = 'project';
-
 $lang->navGroup->story       = 'project';
 $lang->navGroup->branch      = 'project';
 $lang->navGroup->productplan = 'project';

module/common/model.php

@@ -746,7 +746,7 @@ class commonModel extends model
         $group = isset($lang->navGroup->$moduleName) ? $lang->navGroup->$moduleName : '';
         if($moduleName == 'admin') return;
         if($group == 'my' || $group == 'reporting' || $group == 'attend') return;
-        if($group == 'program') self::getProgramModuleMenu($moduleName);
+        if($group == 'project') self::getProgramModuleMenu($moduleName);
 
         if(!isset($lang->$moduleName->menu))
         {
@@ -2241,7 +2241,7 @@ EOD;
     public static function getProgramMainMenu($moduleName)
     {
         global $app, $lang, $dbh;
-        $program = $dbh->query("SELECT * FROM " . TABLE_PROGRAM . " WHERE `id` = '{$app->session->program}'")->fetch();
+        $program = $dbh->query("SELECT * FROM " . TABLE_PROGRAM . " WHERE `id` = '{$app->session->PRJ}'")->fetch();
         if(empty($program)) return;
 
         if($program->model == 'scrum')
@@ -2272,10 +2272,11 @@ EOD;
     public static function getProgramModuleMenu($moduleName)
     {
         global $app, $lang, $dbh;
-        $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->program}'")->fetch();
+        $program = $dbh->query("SELECT * FROM " . TABLE_PROJECT . " WHERE `id` = '{$app->session->PRJ}'")->fetch();
         if(empty($program)) return;
         if($program->model == 'waterfall') 
         {
+            $lang->navGroup->product = 'project';
             $lang->product->menu     = $lang->waterfallproduct->menu;
             $lang->productplan->menu = $lang->waterfallproduct->menu;
             $lang->story->menu       = $lang->waterfallproduct->menu;

module/product/control.php

@@ -132,6 +132,7 @@ class product extends control
      */
     public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
+        $this->lang->navGroup->product = 'project';
         /* Lower browse type. */
         $browseType = strtolower($browseType);
 

module/program/control.php

@@ -9,26 +9,6 @@ class program extends control
         $this->programs = $this->program->getPairs();
     }
 
-    /**
-     * Program index view.
-     *
-     * @param  int    $programID
-     * @access public
-     * @return void
-     */
-    public function index($programID = 0)
-    {
-        $this->lang->navGroup->program = 'project';
-        if(!$programID) $programID = $this->session->PRJ;
-        $this->session->set('program', $programID);
-
-        $this->view->title      = $this->lang->program->common . $this->lang->colon . $this->lang->program->index;
-        $this->view->position[] = $this->lang->program->index;
-        $this->view->program    = $this->program->getPGMByID($programID);
-
-        $this->display();
-    }
-
     /**
      * Program home page.
      *
@@ -908,6 +888,26 @@ class program extends control
         die($link);
     }
 
+    /**
+     * Project index view.
+     *
+     * @param  int    $programID
+     * @access public
+     * @return void
+     */
+    public function index($projectID = 0)
+    {
+        $this->lang->navGroup->program = 'project';
+        if(!$projectID) $projectID = $this->session->PRJ;
+        $this->session->set('PRJ', $projectID);
+
+        $this->view->title      = $this->lang->program->common . $this->lang->colon . $this->lang->program->PRJIndex;
+        $this->view->position[] = $this->lang->program->PRJIndex;
+        $this->view->project    = $this->program->getPRJByID($projectID);
+
+        $this->display();
+    }
+
     /**
      * Projects list.
      *

module/program/lang/zh-cn.php

@@ -1,6 +1,6 @@
 <?php
 /* Actions. */
-$lang->program->index                = '仪表盘';
+$lang->program->PRJIndex             = '仪表盘';
 $lang->program->PRJCreate            = '创建项目';
 $lang->program->PRJCreateGuide       = '选择项目模板';
 $lang->program->PRJEdit              = '编辑项目';

module/program/view/index.html.php

@@ -10,5 +10,5 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php echo $this->fetch('block', 'dashboard', "module=program&type={$program->model}");?>
+<?php echo $this->fetch('block', 'dashboard', "module=program&type={$project->model}");?>
 <?php include '../../common/view/footer.html.php';?>

module/program/view/prjbrowse.html.php

@@ -69,7 +69,7 @@ js::set('browseType', $browseType);
             <td><?php printf('%03d', $project->id);?></td>
             <td class='text-left' title="<?php echo $project->code;?>"><?php echo $project->code;?></td>
             <td class='text-left' title='<?php echo $project->name?>'>
-              <?php echo html::a($this->createLink('project', 'index', 'locate=no'), $project->name);?>
+              <?php echo html::a($this->createLink('program', 'index', "projectID=$project->id", '', '', $project->id), $project->name);?>
             </td>
             <td><?php echo zget($lang->program->statusList, $project->status);?></td>
             <td><?php echo $project->begin;?></td>