From ef9f7ca2fb32baf50e080d349d7e033bb87bf27e Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 15 Feb 2016 14:39:31 +0800
Subject: [PATCH 1/3] * finish task #2506.

---
 module/productplan/view/view.html.php | 1 +
 module/story/control.php              | 8 ++++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 01bcfd7982..8b3d24e01a 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -28,6 +28,7 @@
    {
       ob_start();
       echo "<div class='btn-group'>";
+      common::printIcon('story', 'create', "productID=$plan->product&branch=$plan->branch&moduleID=0&storyID=0&projectID=0&bugID=0&planID=$plan->id", '', 'button', 'plus');
       if(common::hasPriv('productplan', 'linkStory')) echo html::a(inlink('view', "planID=$plan->id&type=story&orderBy=id_desc&link=true"), '<i class="icon-link"></i> ' . $lang->productplan->linkStory, '', "class='btn'");
       if(common::hasPriv('productplan', 'linkBug'))   echo html::a(inlink('view', "planID=$plan->id&type=bug&orderBy=id_desc&link=true"), '<i class="icon-bug"></i> ' . $lang->productplan->linkBug, '', "class='btn'");
       echo '</div>';
diff --git a/module/story/control.php b/module/story/control.php
index 82e80e5ec1..5d266f2f76 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -31,11 +31,16 @@ class story extends control
      * Create a story.
      * 
      * @param  int    $productID 
+     * @param  int    $branch 
      * @param  int    $moduleID 
+     * @param  int    $storyID 
+     * @param  int    $projectID 
+     * @param  int    $bugID 
+     * @param  int    $planID 
      * @access public
      * @return void
      */
-    public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0)
+    public function create($productID = 0, $branch = 0, $moduleID = 0, $storyID = 0, $projectID = 0, $bugID = 0, $planID = 0)
     {
         if(!empty($_POST))
         {
@@ -112,7 +117,6 @@ class story extends control
         $this->product->setMenu($products, $product->id, $branch);
 
         /* Init vars. */
-        $planID     = 0;
         $source     = '';
         $pri        = 0;
         $estimate   = '';

From 86ee7a20550593187252cf03caf2d85870841a89 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 15 Feb 2016 15:21:29 +0800
Subject: [PATCH 2/3] * finish task #2503.

---
 module/bug/view/browse.html.php      | 1 -
 module/doc/view/browse.html.php      | 1 -
 module/product/view/browse.html.php  | 1 -
 module/project/view/task.html.php    | 1 -
 module/testcase/view/browse.html.php | 1 -
 5 files changed, 5 deletions(-)

diff --git a/module/bug/view/browse.html.php b/module/bug/view/browse.html.php
index 61ffd33733..bd1d051d6d 100644
--- a/module/bug/view/browse.html.php
+++ b/module/bug/view/browse.html.php
@@ -73,7 +73,6 @@ js::set('moduleID', $moduleID);
         <?php echo $moduleTree;?>
         <div class='text-right'>
           <?php common::printLink('tree', 'browse', "productID=$productID&view=bug", $lang->tree->manage);?>
-          <?php common::printLink('tree', 'fix',    "root=$productID&type=bug", $lang->tree->fix, 'hiddenwin');?>
         </div>
       </div>
     </div>
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index 06de70f189..2a2f1803bc 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -36,7 +36,6 @@ var browseType = '<?php echo $browseType;?>';
         <?php echo $moduleTree;?>
         <div class='text-right'>
           <?php common::printLink('tree', 'browse', "rootID=$libID&view=doc", $lang->doc->manageType);?>
-          <?php if(is_numeric($libID)) common::printLink('tree', 'fix', "root=$libID&type=customdoc", $lang->tree->fix, 'hiddenwin');?>
         </div>
       </div>
     </div>
diff --git a/module/product/view/browse.html.php b/module/product/view/browse.html.php
index 6591d00cee..d6fbe2bcad 100644
--- a/module/product/view/browse.html.php
+++ b/module/product/view/browse.html.php
@@ -63,7 +63,6 @@
         <?php echo $moduleTree;?>
         <div class='text-right'>
           <?php common::printLink('tree', 'browse', "rootID=$productID&view=story", $lang->tree->manage);?>
-          <?php common::printLink('tree', 'fix',    "root=$productID&type=story", $lang->tree->fix, 'hiddenwin');?>
         </div>
       </div>
     </div>
diff --git a/module/project/view/task.html.php b/module/project/view/task.html.php
index 2d17e432d2..8e43f3a94e 100644
--- a/module/project/view/task.html.php
+++ b/module/project/view/task.html.php
@@ -31,7 +31,6 @@
           <?php common::printLink('project', 'edit',    "projectID=$projectID", $lang->edit);?>
           <?php common::printLink('project', 'delete',  "projectID=$projectID&confirm=no", $lang->delete, 'hiddenwin');?>
           <?php common::printLink('tree', 'browsetask', "rootID=$projectID&productID=0", $lang->tree->manage);?>
-          <?php common::printLink('tree', 'fix',        "root=$projectID&type=task", $lang->tree->fix, 'hiddenwin');?>
         </div>
       </div>
     </div>
diff --git a/module/testcase/view/browse.html.php b/module/testcase/view/browse.html.php
index fcd4e53f23..35ab3729b1 100644
--- a/module/testcase/view/browse.html.php
+++ b/module/testcase/view/browse.html.php
@@ -29,7 +29,6 @@ js::set('batchDelete', $lang->testcase->confirmBatchDelete);
         <?php echo $moduleTree;?>
         <div class='text-right'>
           <?php common::printLink('tree', 'browse', "productID=$productID&view=case", $lang->tree->manage);?>
-          <?php common::printLink('tree', 'fix',    "root=$productID&type=case", $lang->tree->fix, 'hiddenwin');?>
         </div>
       </div>
     </div>

From 5266c8c064e7129be76d60c69a55e074956a9793 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Mon, 15 Feb 2016 15:42:21 +0800
Subject: [PATCH 3/3] * finish task #2499.

---
 module/productplan/view/browse.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/productplan/view/browse.html.php b/module/productplan/view/browse.html.php
index c02963478b..f4d8d8440a 100644
--- a/module/productplan/view/browse.html.php
+++ b/module/productplan/view/browse.html.php
@@ -32,7 +32,7 @@
     <?php if($this->session->currentProductType != 'normal'):?>
     <th class='w-100px'> <?php common::printOrderLink('branch',$orderBy, $vars, $lang->product->branch);?></th>
     <?php endif;?>
-    <th class='w-p50'>   <?php common::printOrderLink('desc',  $orderBy, $vars, $lang->productplan->desc);?></th>
+    <th class='w-p50'>   <?php echo $lang->productplan->desc;?></th>
     <th class='w-100px'> <?php common::printOrderLink('begin', $orderBy, $vars, $lang->productplan->begin);?></th>
     <th class='w-100px'> <?php common::printOrderLink('end',   $orderBy, $vars, $lang->productplan->end);?></th>
     <th class="w-110px {sorter: false}"><?php echo $lang->actions;?></th>