From f847f1228b09f6d0bb337ea5c588418632787b8e Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Tue, 6 Dec 2011 07:32:09 +0000
Subject: [PATCH]  * adjust code for task #616.

---
 module/common/lang/en.php                         |  2 +-
 module/common/lang/zh-cn.php                      |  4 ++--
 module/product/control.php                        | 15 +++++++++++++--
 .../view/{index.html.php => project.html.php}     |  0
 4 files changed, 16 insertions(+), 5 deletions(-)
 rename module/product/view/{index.html.php => project.html.php} (100%)

diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index f04ebdd984..26654042c4 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -139,7 +139,7 @@ $lang->product->menu->view    = 'Info|product|view|productID=%s';
 $lang->product->menu->edit    = 'Edit|product|edit|productID=%s';
 $lang->product->menu->module  = 'Modules|tree|browse|productID=%s&view=story';
 $lang->product->menu->create  = array('link' => 'New Product|product|create', 'float' => 'right');
-$lang->product->menu->project = array('link' => 'Project list|product|index|locate=false&status=all&productID=%s', 'float' => 'right');
+$lang->product->menu->project = array('link' => 'Project list|product|project|status=all&productID=%s', 'float' => 'right');
 $lang->story->menu            = $lang->product->menu;
 $lang->productplan->menu      = $lang->product->menu;
 $lang->release->menu          = $lang->product->menu;
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index aec976ad33..a0186b8cf9 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -139,7 +139,7 @@ $lang->product->menu->view    = '概况|product|view|productID=%s';
 $lang->product->menu->edit    = '编辑|product|edit|productID=%s';
 $lang->product->menu->module  = '模块|tree|browse|productID=%s&view=story';
 $lang->product->menu->create  = array('link' => '新增产品|product|create', 'float' => 'right');
-$lang->product->menu->project = array('link' => '项目列表|product|index|locate=false&status=all&productID=%s', 'float' => 'right');
+$lang->product->menu->project = array('link' => '项目列表|product|project|status=all&productID=%s', 'float' => 'right');
 $lang->story->menu            = $lang->product->menu;
 $lang->productplan->menu      = $lang->product->menu;
 $lang->release->menu          = $lang->product->menu;
@@ -160,7 +160,7 @@ $lang->project->menu->linkstory = array('link' => '关联需求|project|linkstor
 $lang->project->menu->view      = '概况|project|view|projectID=%s';
 $lang->project->menu->edit      = '编辑|project|edit|projectID=%s';
 $lang->project->menu->create    = array('link' => '新增项目|project|create', 'float' => 'right');
-$lang->project->menu->all       = array('link' => '项目列表|project|index|locate=false', 'float' => 'right');
+$lang->project->menu->all       = array('link' => '所有项目|project|index|locate=false', 'float' => 'right');
 $lang->task->menu            = $lang->project->menu;
 $lang->build->menu           = $lang->project->menu;
 
diff --git a/module/product/control.php b/module/product/control.php
index 5c5e0757a2..1679b75714 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -41,10 +41,21 @@ class product extends control
      * @access public
      * @return void
      */
-    public function index($locate = 'yes', $status = 'undone', $productID = 0)
+    public function index()
     {
-        if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
+        $this->locate($this->createLink($this->moduleName, 'browse'));
+    }
 
+    /**
+     * project 
+     * 
+     * @param  string $status 
+     * @param  int    $productID 
+     * @access public
+     * @return void
+     */
+    public function project($status = 'all', $productID = 0)
+    {
         $this->app->loadLang('my');
         $this->view->projectStats  = $this->loadModel('project')->getProjectStats($this->config->project->projectCounts, $status, $productID);
 
diff --git a/module/product/view/index.html.php b/module/product/view/project.html.php
similarity index 100%
rename from module/product/view/index.html.php
rename to module/product/view/project.html.php