From 61b5f77f910489e7d337f412db1535a82a44306d Mon Sep 17 00:00:00 2001
From: pengjiangxiu <riverdream@yeah.net>
Date: Tue, 22 Aug 2017 13:05:13 +0800
Subject: [PATCH] * Finish task #3201.

---
 module/product/control.php       | 21 +++++++++++----------
 module/task/model.php            |  2 +-
 module/tree/model.php            | 12 ++++++------
 module/tree/view/browse.html.php |  4 ++--
 4 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 0041c9fe51..387c9a1c32 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -99,14 +99,14 @@ class product extends control
 
     /**
      * Browse a product.
-     * 
-     * @param  int    $productID 
-     * @param  string $browseType 
-     * @param  int    $param 
-     * @param  string $orderBy 
-     * @param  int    $recTotal 
-     * @param  int    $recPerPage 
-     * @param  int    $pageID 
+     *
+     * @param  int    $productID
+     * @param  string $browseType
+     * @param  int    $param
+     * @param  string $orderBy
+     * @param  int    $recTotal
+     * @param  int    $recPerPage
+     * @param  int    $pageID
      * @access public
      * @return void
      */
@@ -136,8 +136,9 @@ class product extends control
         if($browseType == 'bymodule') setcookie('storyModule', (int)$param, $this->config->cookieLife, $this->config->webRoot);
         if($browseType != 'bymodule') $this->session->set('storyBrowseType', $browseType);
 
-        $moduleID  = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
-        $queryID   = ($browseType == 'bysearch') ? (int)$param : 0;
+        $moduleID = ($browseType == 'bymodule') ? (int)$param : ($browseType == 'bysearch' ? 0 : ($this->cookie->storyModule ? $this->cookie->storyModule : 0));
+        $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
+        if($browseType == 'unclosed') $moduleID = 0;
 
         /* Set menu. */
         $this->product->setMenu($this->products, $productID, $branch);
diff --git a/module/task/model.php b/module/task/model.php
index 0ab27e780b..72f1752d83 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -939,7 +939,7 @@ class taskModel extends model
 
     /**
      * Get project tasks pairs.
-     * 
+     *
      * @param  int    $projectID 
      * @param  string $status
      * @param  string $orderBy 
diff --git a/module/tree/model.php b/module/tree/model.php
index e2a34cfcd0..bf188c0a96 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -1175,11 +1175,11 @@ class treeModel extends model
 
     /**
      * Manage childs of a module.
-     * 
-     * @param  int    $rootID 
-     * @param  string $type 
-     * @param  int    $parentModuleID 
-     * @param  array  $childs 
+     *
+     * @param  int    $rootID
+     * @param  string $type
+     * @param  int    $parentModuleID
+     * @param  array  $childs
      * @access public
      * @return void
      */
@@ -1246,7 +1246,7 @@ class treeModel extends model
 
     /**
      * Update a module.
-     * 
+     *
      * @param  int    $moduleID 
      * @access public
      * @return void
diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php
index eb97917ae4..bebc480234 100644
--- a/module/tree/view/browse.html.php
+++ b/module/tree/view/browse.html.php
@@ -30,7 +30,7 @@
     <form id='childrenForm' class='form-condensed' method='post' target='hiddenwin' action='<?php echo $this->createLink('tree', 'manageChild', "root={$root->id}&viewType=$viewType");?>'>
       <div class='panel'>
         <div class='panel-heading'>
-          <i class='icon-sitemap'></i> 
+          <i class='icon-sitemap'></i>
           <?php $manageChild = 'manage' . ucfirst($viewType) . 'Child';?>
           <?php echo strpos($viewType, 'doc') !== false ? $lang->doc->manageType : $lang->tree->$manageChild;?>
           <?php if($viewType == 'story' and $allProduct):?>
@@ -53,7 +53,7 @@
                 ?>
                 </nobr>
               </td>
-              <td id='moduleBox'> 
+              <td id='moduleBox'>
                 <?php
                 if($viewType == 'story' and $allProduct)
                 {