diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php
index 6a5d10b94b..f63a46f97b 100644
--- a/module/product/view/ajaxgetdropmenu.html.php
+++ b/module/product/view/ajaxgetdropmenu.html.php
@@ -20,6 +20,12 @@ $myProductsHtml     = '';
 $normalProductsHtml = '';
 $closedProductsHtml = '';
 
+if($this->app->openApp == 'project' and $this->app->rawModule == 'testcase')
+{
+    $linkHtml        = $this->product->setParamsForLink($module, $link, $projectID, 0);
+    $myProductsHtml .= html::a($linkHtml, $this->lang->product->all, '', "class='text-important' title='{$this->lang->product->all}' data-key='" . zget($productsPinYin, $this->lang->product->all, '') . "' data-app='project'");
+}
+
 foreach($products as $product)
 {
     $selected     = $product->id == $productID ? 'selected' : '';
diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php
index 810b60bcf5..e94f95c7fd 100644
--- a/module/program/view/browsebylist.html.php
+++ b/module/program/view/browsebylist.html.php
@@ -45,7 +45,8 @@
 
       <tr <?php echo $trAttrs;?>>
         <td class='c-name text-left <?php if($canOrder) echo 'sort-handler';?>' title='<?php echo $program->name?>'>
-          <span class="table-nest-icon icon icon-<?php echo $program->type; ?>"></span>
+          <?php $class = $program->type == 'program' ? ' table-nest-toggle' : '';?>
+          <span class="table-nest-icon icon icon-<?php echo $program->type;?> <?php echo $class;?>"></span>
           <?php if($program->type == 'program'):?>
           <?php echo html::a($this->createLink('program', 'product', "programID=$program->id"), $program->name);?>
           <?php else:?>
@@ -122,7 +123,6 @@
 #programList .c-actions {overflow: visible;}
 #programTableList > tr:last-child .c-actions .dropdown-menu {top: auto; bottom: 100%; margin-bottom: -5px;}
 #programTableList .icon-project:before {content: '\e99c'; width: 22px; height: 22px; background: none; color: #16a8f8; top: 0; line-height: 22px; margin-right: 2px; font-size: 14px}
-#programTableList .no-nest .icon-program:before, #programTableList .is-nest-child .icon-program:before {width: 10px; min-width: 10px; height: 10px; top: 1px}
 </style>
 <?php js::set('originOrders', $originOrders);?>
 <script>
diff --git a/module/project/control.php b/module/project/control.php
index 695a7d215d..4db998a531 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -748,7 +748,10 @@ class project extends control
      * Project case list.
      *
      * @param  int    $projectID
-     * @param  string $type
+     * @param  int    $productID
+     * @param  int    $branch
+     * @param  string $browseType
+     * @param  int    $param
      * @param  string $orderBy
      * @param  int    $recTotal
      * @param  int    $recPerPage
@@ -756,34 +759,9 @@ class project extends control
      * @access public
      * @return void
      */
-    public function testcase($projectID = 0, $type = 'all', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function testcase($projectID = 0, $productID = 0, $branch = 0, $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->loadModel('testcase');
-        $this->loadModel('testtask');
-
-        $this->project->setMenu($projectID);
-
-        $products  = $this->project->getProducts($projectID);
-        $productID = key($products);    // Get the first product for creating testcase.
-
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = pager::init($recTotal, $recPerPage, $pageID);
-
-        $cases = $this->loadModel('testcase')->getProjectCases($projectID, $orderBy, $pager, $type);
-        $cases = $this->testcase->appendData($cases, 'run');
-
-        $this->view->title       = $this->lang->execution->testcase;
-        $this->view->projectID   = $projectID;
-        $this->view->productID   = $productID;
-        $this->view->cases       = $cases;
-        $this->view->orderBy     = $orderBy;
-        $this->view->pager       = $pager;
-        $this->view->type        = $type;
-        $this->view->users       = $this->loadModel('user')->getPairs('noletter');
-        $this->view->project     = $this->project->getById($projectID);
-
-        $this->display();
+        echo $this->fetch('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=$orderBy&recTotal=$orderBy&recPerPage=$recPerPage&pageID=$pageID&projectID=$projectID");
     }
 
     /**
diff --git a/module/project/view/testcase.html.php b/module/project/view/testcase.html.php
index 90af3ae044..ab047c062f 100644
--- a/module/project/view/testcase.html.php
+++ b/module/project/view/testcase.html.php
@@ -1,78 +1,243 @@
-<?php include '../../common/view/header.html.php';?>
-<div id="mainMenu" class="clearfix">
-  <div class="btn-toolbar pull-left">
-    <?php echo html::a(inlink('testcase', "projectID=$projectID&type=$type&orderBy=$orderBy"), "<span class='text'>{$lang->project->all}</span>", '', "class='btn btn-link btn-active-text'");?>
-  </div>
-  <div class="btn-toolbar pull-right">
-    <?php if(common::canModify('project', $project)) echo html::a(helper::createLink('testcase', 'create', "productID=$productID&branch=0&moduleID=0&from=project&param=$project->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary' data-app='project'");?>
-  </div>
-</div>
-<div id="mainContent">
-  <?php if(empty($cases)):?>
-  <div class="table-empty-tip">
-    <p>
-      <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
-      <?php if(common::canModify('project', $project) and common::hasPriv('testcase', 'create')):?>
-      <?php echo html::a(helper::createLink('testcase', 'create', "productID=$productID&branch=0&moduleID=0&from=project&param=$project->id", '', '', '', true), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info' data-app='project'");?>
+<?php
+/**
+ * The testcase view file of project module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     project
+ * @version     $Id: testcase.html.php 5108 2013-07-12 01:59:04Z chencongzhi520@gmail.com $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php
+include '../../common/view/header.html.php';
+include '../../common/view/datepicker.html.php';
+include '../../common/view/datatable.fix.html.php';
+include './caseheader.html.php';
+js::set('browseType',     $browseType);
+js::set('caseBrowseType', ($browseType == 'bymodule' and $this->session->caseBrowseType == 'bysearch') ? 'all' : $this->session->caseBrowseType);
+js::set('moduleID'  ,     $moduleID);
+js::set('confirmDelete',  $lang->testcase->confirmDelete);
+js::set('batchDelete',    $lang->testcase->confirmBatchDelete);
+js::set('productID',      $productID);
+js::set('branch',         $branch);
+js::set('suiteID',        $suiteID);
+?>
+<div id="mainContent" class="main-row fade">
+  <div class='side-col' id='sidebar'>
+    <div class="sidebar-toggle"><i class="icon icon-angle-left"></i></div>
+    <div class='cell'>
+      <?php if(!$moduleTree):?>
+      <hr class="space">
+      <div class="text-center text-muted"><?php echo $lang->testcase->noModule;?></div>
+      <hr class="space">
       <?php endif;?>
-    </p>
+      <?php echo $moduleTree;?>
+      <div class='text-center'>
+        <?php common::printLink('tree', 'browse', "productID=$productID&view=case&currentModuleID=0&branch=0&from={$this->lang->navGroup->testcase}", $lang->tree->manage, '', "class='btn btn-info btn-wide'");?>
+        <hr class="space-sm" />
+      </div>
+    </div>
   </div>
-  <?php else:?>
-  <form class='main-table' method='post' id='projectBugForm' data-ride="table">
-    <table class='table has-sort-head' id='bugList'>
-    <?php $vars = "projectID=$projectID&type=$type&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?>
-      <thead>
-        <tr>
-          <th class='w-50px'>  <?php common::printOrderLink('id',       $orderBy, $vars, $lang->idAB);?></th>
-          <th class='w-50px'>  <?php common::printOrderLink('pri',      $orderBy, $vars, $lang->priAB);?></th>
-          <th>                 <?php common::printOrderLink('title',    $orderBy, $vars, $lang->testcase->title);?></th>
-          <th class='w-type'>  <?php common::printOrderLink('type',     $orderBy, $vars, $lang->typeAB);?></th>
-          <th class='c-user'>  <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-          <th class='w-80px'>  <?php common::printOrderLink('lastRunner',    $orderBy, $vars, $lang->testtask->lastRunAccount);?></th>
-          <th class='w-120px'> <?php common::printOrderLink('lastRunDate',   $orderBy, $vars, $lang->testtask->lastRunTime);?></th>
-          <th class='w-80px'>  <?php common::printOrderLink('lastRunResult', $orderBy, $vars, $lang->testtask->lastRunResult);?></th>
-          <th class='c-status'><?php common::printOrderLink('status',        $orderBy, $vars, $lang->statusAB);?></th>
-          <th class='c-actions-5 text-center'> <?php echo $lang->actions;?></th>
-        </tr>
-      </thead>
-      <tbody>
-        <?php foreach($cases as $case):?>
-        <?php
-        $caseID = $type == 'assigntome' ? $case->case : $case->id;
-        $runID  = $type == 'assigntome' ? $case->id   : 0;
-        $canBeChanged = common::canBeChanged('testcase', $case);
-        ?>
-        <tr>
-          <td class="c-id">
-            <?php echo sprintf('%03d', $case->id); ?>
-          </td>
-          <td><span class='label-pri <?php echo 'label-pri-' . $case->pri?>' title='<?php echo zget($lang->testcase->priList, $case->pri, $case->pri);?>'><?php echo zget($lang->testcase->priList, $case->pri, $case->pri)?></span></td>
-          <?php $params = "testcaseID=$caseID&version=$case->version";?>
-          <?php if($type == 'assigntome') $params .= "&from=testtask&taskID=$case->task";?>
-          <td class='text-left'><?php echo html::a($this->createLink('testcase', 'view', $params, '', '', $case->project), $case->title, null, "style='color: $case->color' data-group='project'");?></td>
-          <td><?php echo zget($lang->testcase->typeList, $case->type);?></td>
-          <td><?php echo zget($users, $case->openedBy);?></td>
-          <td><?php echo zget($users, $case->lastRunner);?></td>
-          <td><?php if(!helper::isZeroDate($case->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($case->lastRunDate));?></td>
-          <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
-          <td class='<?php if(isset($run)) echo $run->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
-          <td class='c-actions'>
+  <div class='main-col'>
+    <div id='queryBox' data-module='testcase' class='cell<?php if($browseType == 'bysearch') echo ' show';?>'></div>
+    <?php if(empty($cases)):?>
+    <?php $useDatatable = '';?>
+    <div class="table-empty-tip">
+      <p>
+        <span class="text-muted"><?php echo $lang->testcase->noCase;?></span>
+        <?php if(common::canModify('product', $product) and common::hasPriv('testcase', 'create')):?>
+        <?php $initModule = isset($moduleID) ? (int)$moduleID : 0;?>
+        <?php echo html::a($this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule"), "<i class='icon icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-info'");?>
+        <?php endif;?>
+      </p>
+    </div>
+    <?php else:?>
+    <?php
+    $datatableId  = $this->moduleName . ucfirst($this->methodName);
+    $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+    ?>
+    <form class='main-table table-case' id='caseForm' method='post' <?php if(!$useDatatable) echo "data-ride='table'";?>>
+      <div class="table-header fixed-right">
+        <nav class="btn-toolbar pull-right"></nav>
+      </div>
+      <?php
+      $vars = "productID=$productID&branch=$branch&browseType=$browseType&param=$param&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+
+      if($useDatatable)  include '../../common/view/datatable.html.php';
+      else               include '../../common/view/tablesorter.html.php';
+
+      if($config->testcase->needReview or !empty($config->testcase->forceReview)) $config->testcase->datatable->fieldList['actions']['width'] = '180';
+      $setting = $this->datatable->getSetting('testcase');
+      $widths  = $this->datatable->setFixedFieldWidth($setting);
+      $columns = 0;
+
+      $canBatchRun                = common::hasPriv('testtask', 'batchRun');
+      $canBatchEdit               = common::hasPriv('testcase', 'batchEdit');
+      $canBatchDelete             = common::hasPriv('testcase', 'batchDelete');
+      $canBatchCaseTypeChange     = common::hasPriv('testcase', 'batchCaseTypeChange');
+      $canBatchConfirmStoryChange = common::hasPriv('testcase', 'batchConfirmStoryChange');
+      $canBatchChangeModule       = common::hasPriv('testcase', 'batchChangeModule');
+
+      $canBatchAction             = ($canBatchRun or $canBatchEdit or $canBatchDelete or $canBatchCaseTypeChange or $canBatchConfirmStoryChange or $canBatchChangeModule);
+      ?>
+      <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
+      <table class='table has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='caseList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>' data-checkbox-name='caseIDList[]'>
+        <thead>
+          <tr>
+          <?php
+          foreach($setting as $key => $value)
+          {
+              if($value->show)
+              {
+                  $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
+                  $columns ++;
+              }
+          }
+          ?>
+          </tr>
+        </thead>
+        <tbody>
+          <?php foreach($cases as $case):?>
+          <tr data-id='<?php echo $case->id?>'>
+            <?php foreach($setting as $key => $value) $this->testcase->printCell($value, $case, $users, $branches, $modulePairs, $browseType, $useDatatable ? 'datatable' : 'table');?>
+          </tr>
+          <?php endforeach;?>
+        </tbody>
+      </table>
+      <?php if(!$useDatatable) echo '</div>';?>
+      <div class='table-footer'>
+        <?php if($canBatchAction):?>
+        <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
+        <?php endif;?>
+        <div class='table-actions btn-toolbar'>
+          <div class='btn-group dropup'>
             <?php
-            if($canBeChanged)
-            {
-                common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$caseID,version=$case->version,runID=$runID", $case, 'list', 'bug', '', '', '', '', '', $case->project);
-                common::printIcon('testcase', 'create',  "productID=$case->product&branch=$case->branch&moduleID=$case->module&from=testcase&param=$caseID", $case, 'list', 'copy', '', '', '', '', '', $case->project);
-                common::printIcon('testtask', 'runCase', "runID=$runID&caseID=$caseID&version=$case->version", '', 'list', 'play', '', 'iframe', true, "data-width='95%'", '', $case->project);
-                common::printIcon('testtask', 'results', "runID=$runID&caseID=$caseID", '', 'list', 'list-alt', '', 'iframe', true, "data-width='95%'", '', $case->project);
-                common::printIcon('testcase', 'edit',    "caseID=$caseID", $case, 'list', 'edit', '', '', '', '', '', $case->project);
-            }
+            $actionLink = $this->createLink('testtask', 'batchRun', "productID=$productID&orderBy=$orderBy");
+            $misc = $canBatchRun ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+            echo html::commonButton($lang->testtask->runCase, $misc);
+
+            $actionLink = $this->createLink('testcase', 'batchEdit', "productID=$productID&branch=$branch");
+            $misc       = $canBatchEdit ? "onclick=\"setFormAction('$actionLink')\"" : "disabled='disabled'";
+            echo html::commonButton($lang->edit, $misc);
             ?>
-          </td> 
-        </tr>
-        <?php endforeach;?>
-      </tbody>
-    </table>
-  </form>
-  <?php endif;?>
+            <button type='button' class='btn dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
+            <ul class='dropdown-menu' id='moreActionMenu'>
+              <?php
+              if(common::hasPriv('testcase', 'batchReview') and ($config->testcase->needReview or !empty($config->testcase->forceReview)))
+              {
+                  echo "<li class='dropdown-submenu'>";
+                  echo html::a('javascript:;', $lang->testcase->review, '', "id='reviewItem'");
+                  echo "<ul class='dropdown-menu'>";
+                  unset($lang->testcase->reviewResultList['']);
+                  foreach($lang->testcase->reviewResultList as $key => $result)
+                  {
+                      $actionLink = $this->createLink('testcase', 'batchReview', "result=$key");
+                      echo '<li>' . html::a('#', $result, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . '</li>';
+                  }
+                  echo '</ul></li>';
+              }
+
+              if($canBatchDelete)
+              {
+                  $actionLink = $this->createLink('testcase', 'batchDelete', "productID=$productID");
+                  $misc       = "onclick=\"confirmBatchDelete('$actionLink')\"";
+                  echo "<li>" . html::a('#', $lang->delete, '', $misc) . "</li>";
+              }
+
+              if($canBatchCaseTypeChange)
+              {
+                  echo "<li class='dropdown-submenu'>";
+                  echo html::a('javascript:;', $lang->testcase->type, '', "id='typeChangeItem'");
+                  echo "<ul class='dropdown-menu'>";
+                  unset($lang->testcase->typeList['']);
+                  foreach($lang->testcase->typeList as $key => $result)
+                  {
+                      $actionLink = $this->createLink('testcase', 'batchCaseTypeChange', "result=$key");
+                      echo '<li>' . html::a('#', $result, '', "onclick=\"setFormAction('$actionLink', 'hiddenwin')\"") . '</li>';
+                  }
+                  echo '</ul></li>';
+              }
+
+              if($canBatchConfirmStoryChange)
+              {
+                  $actionLink = $this->createLink('testcase', 'batchConfirmStoryChange', "productID=$productID");
+                  $misc       = "onclick=\"setFormAction('$actionLink')\"";
+                  echo "<li>" . html::a('#', $lang->testcase->confirmStoryChange, '', $misc) . "</li>";
+              }
+              ?>
+            </ul>
+          </div>
+          <?php if(common::hasPriv('testcase', 'batchChangeBranch') and $this->session->currentProductType != 'normal'):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->product->branchName[$this->session->currentProductType];?> <span class="caret"></span></button>
+            <?php $withSearch = count($branches) > 10;?>
+            <?php if($withSearch):?>
+            <div class="dropdown-menu search-list search-box-sink" data-ride="searchList">
+              <div class="input-control search-box has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+            <?php $branchsPinYin = common::convert2Pinyin($branches);?>
+            <?php else:?>
+            <div class="dropdown-menu search-list">
+            <?php endif;?>
+              <div class="list-group">
+                <?php
+                foreach($branches as $branchID => $branchName)
+                {
+                    $searchKey = $withSearch ? ('data-key="' . zget($branchsPinYin, $branchName, '') . '"') : '';
+                    $actionLink = $this->createLink('testcase', 'batchChangeBranch', "branchID=$branchID");
+                    echo html::a('#', $branchName, '', "$searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+                }
+                ?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
+          <?php if($canBatchChangeModule):?>
+          <div class="btn-group dropup">
+            <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->moduleAB;?> <span class="caret"></span></button>
+            <?php $withSearch = count($modules) > 10;?>
+            <?php if($withSearch):?>
+            <div class="dropdown-menu search-list search-box-sink" data-ride="searchList">
+              <div class="input-control search-box has-icon-left has-icon-right search-example">
+                <input id="userSearchBox" type="search" autocomplete="off" class="form-control search-input">
+                <label for="userSearchBox" class="input-control-icon-left search-icon"><i class="icon icon-search"></i></label>
+                <a class="input-control-icon-right search-clear-btn"><i class="icon icon-close icon-sm"></i></a>
+              </div>
+              <?php $modulesPinYin = common::convert2Pinyin($modules);?>
+            <?php else:?>
+            <div class="dropdown-menu search-list">
+            <?php endif;?>
+              <div class="list-group">
+                <?php
+                foreach($modules as $moduleId => $module)
+                {
+                    $searchKey = $withSearch ? ('data-key="' . zget($modulesPinYin, $module, '') . '"') : '';
+                    $actionLink = $this->createLink('testcase', 'batchChangeModule', "moduleID=$moduleId");
+                    echo html::a('#', $module, '', "title='$module' $searchKey onclick=\"setFormAction('$actionLink', 'hiddenwin')\"");
+                }
+                ?>
+              </div>
+            </div>
+          </div>
+          <?php endif;?>
+        </div>
+        <div class="table-statistic"><?php echo $summary;?></div>
+        <?php $pager->show('right', 'pagerjs');?>
+      </div>
+    </form>
+    <?php endif;?>
+  </div>
 </div>
+<script>
+$('#module' + moduleID).closest('li').addClass('active');
+$('#' + caseBrowseType + 'Tab').addClass('btn-active-text').find('.text').after(" <span class='label label-light label-badge'><?php echo $pager->recTotal;?></span>");
+<?php if($useDatatable):?>
+$(function(){$('#caseForm').table();})
+<?php endif;?>
+</script>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/story/control.php b/module/story/control.php
index 39e2993cc0..fd280e6b9e 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -1458,9 +1458,16 @@ class story extends control
         $products = $this->product->getPairs();
 
         $this->loadModel('testcase');
-        $this->app->rawModule = 'testcase';
-        $this->loadModel('qa')->setMenu($products, $productID);
-        foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        else
+        {
+            $this->app->rawModule = 'testcase';
+            $this->loadModel('qa')->setMenu($products, $productID);
+            foreach($this->config->qa->menuList as $module) $this->lang->navGroup->$module = 'qa';
+        }
 
         /* Append id for secend sort. */
         $sort = $this->loadModel('common')->appendOrder($orderBy);
diff --git a/module/testcase/control.php b/module/testcase/control.php
index 010bece620..3c3f60f5bb 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -40,9 +40,7 @@ class testcase extends control
         $this->loadModel('tree');
         $this->loadModel('user');
 
-        /* Set test case menu group. */
-        $this->projectID = isset($_GET['PRJ']) ? $_GET['PRJ'] : 0;
-        $this->view->products = $this->products = $this->product->getProductPairsByProject($this->projectID);
+        $this->view->products = $this->products = $this->product->getPairs();
         if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testcase")));
     }
 
@@ -67,10 +65,11 @@ class testcase extends control
      * @param  int    $recTotal
      * @param  int    $recPerPage
      * @param  int    $pageID
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function browse($productID = 0, $branch = '', $browseType = 'all', $param = 0, $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
     {
         $this->loadModel('datatable');
 
@@ -78,7 +77,7 @@ class testcase extends control
         $browseType = strtolower($browseType);
 
         /* Set browseType, productID, moduleID and queryID. */
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->app->openApp != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
         $branch    = ($branch === '') ? (int)$this->cookie->preBranch : (int)$branch;
         setcookie('preProductID', $productID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
         setcookie('preBranch', (int)$branch, $this->config->cookieLife, $this->config->webRoot, '', false, true);
@@ -97,7 +96,8 @@ class testcase extends control
         $queryID  = ($browseType == 'bysearch') ? (int)$param : 0;
 
         /* Set menu, save session. */
-        $this->testcase->setMenu($this->products, $productID, $branch, $moduleID, $suiteID, $orderBy);
+        if($this->app->openApp == 'project') $this->products = array('0' => $this->lang->product->all) + $this->products;
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($projectID) : $this->testcase->setMenu($this->products, $productID, $branch, $moduleID, $suiteID, $orderBy);
         $this->session->set('caseList', $this->app->getURI(true));
         $this->session->set('productID', $productID);
         $this->session->set('moduleID', $moduleID);
@@ -136,6 +136,16 @@ class testcase extends control
         $showModule = !empty($this->config->datatable->testcaseBrowse->showModule) ? $this->config->datatable->testcaseBrowse->showModule : '';
         $this->view->modulePairs = $showModule ? $this->tree->getModulePairs($productID, 'case', $showModule) : array();
 
+        /* Get module tree.*/
+        if($projectID and empty($productID))
+        {
+            $moduleTree = $this->tree->getCaseTreeMenu($projectID, $productID, 0, array('treeModel', 'createCaseLink'));
+        }
+        else
+        {
+            $moduleTree = $this->tree->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createCaseLink'), '', $branch);
+        }
+
         /* Assign. */
         $tree = $moduleID ? $this->tree->getByID($moduleID) : '';
         $this->view->title         = $this->products[$productID] . $this->lang->colon . $this->lang->testcase->common;
@@ -145,7 +155,7 @@ class testcase extends control
         $this->view->product       = $this->product->getById($productID);
         $this->view->productName   = $this->products[$productID];
         $this->view->modules       = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $branch);
-        $this->view->moduleTree    = $this->tree->getTreeMenu($productID, $viewType = 'case', $startModuleID = 0, array('treeModel', 'createCaseLink'), '', $branch);
+        $this->view->moduleTree    = $moduleTree;
         $this->view->moduleName    = $moduleID ? $tree->name : $this->lang->tree->all;
         $this->view->moduleID      = $moduleID;
         $this->view->summary       = $this->testcase->summary($cases);
@@ -180,7 +190,7 @@ class testcase extends control
 
         $this->app->loadLang('testtask');
 
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
         $this->session->set('caseList', $this->app->getURI(true));
 
         $cases = $this->testcase->getModuleCases($productID, $branch, 0, $groupBy);
@@ -268,6 +278,8 @@ class testcase extends control
 
             $this->loadModel('action');
             $this->action->create('case', $caseID, 'Opened');
+            if($this->app->openApp == 'project') $this->action->create('case', $caseID, 'linked2project', '', $this->session->PRJ);
+            if($this->app->openApp == 'execution') $this->action->create('case', $caseID, 'linked2execution', '', $this->session->execution);
 
             $this->executeHooks($caseID);
 
@@ -286,7 +298,7 @@ class testcase extends control
         if($branch === '') $branch = (int)$this->cookie->preBranch;
 
         /* Set menu. */
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
 
         /* Init vars. */
         $type         = 'feature';
@@ -430,7 +442,7 @@ class testcase extends control
         $currentModuleID = (int)$moduleID;
 
         /* Set menu. */
-        $this->testcase->setMenu($this->products, $productID, $branch);
+        $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
 
         /* Set story list. */
         $story     = $storyID ? $this->story->getByID($storyID) : '';
@@ -678,7 +690,7 @@ class testcase extends control
             $position[] = html::a($this->createLink('testcase', 'browse', "productID=$productID"), $this->products[$productID]);
 
             /* Set menu. */
-            $this->testcase->setMenu($this->products, $productID, $case->branch);
+            $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $case->branch);
 
             $moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'case', $startModuleID = 0, $case->branch);
             if($case->lib and $case->fromCaseID)
@@ -745,6 +757,7 @@ class testcase extends control
         $caseIDList = array_unique($caseIDList);
         $branchProduct = false;
 
+        if($this->app->openApp == 'project') $this->loadModel('project')->setMenu($this->session->project);
         /* The cases of a product. */
         if($productID)
         {
@@ -769,7 +782,7 @@ class testcase extends control
             else
             {
                 $product = $this->product->getByID($productID);
-                $this->testcase->setMenu($this->products, $productID, $branch);
+                $this->app->openApp == 'project' ? $this->loadModel('project')->setMenu($this->session->project) : $this->testcase->setMenu($this->products, $productID, $branch);
 
                 if($product->type != 'normal') $branchProduct = true;
 
@@ -788,7 +801,9 @@ class testcase extends control
             /* Get the edited cases. */
             $cases = $this->dao->select('t1.*,t2.id as runID')->from(TABLE_CASE)->alias('t1')
                 ->leftJoin(TABLE_TESTRUN)->alias('t2')->on('t1.id = t2.case')
-                ->where('t2.id')->in($caseIDList)
+                ->where('t1.deleted')->eq(0)
+                ->beginIF($this->app->openApp == 'my')->andWhere('t2.id')->in($caseIDList)->fi()
+                ->beginIF($this->app->openApp != 'my')->andWhere('t1.id')->in($caseIDList)->fi()
                 ->fetchAll('id');
             $caseIDList = array_keys($cases);
 
@@ -818,7 +833,7 @@ class testcase extends control
         // if(!$this->testcase->forceNotReview()) unset($this->lang->testcase->statusList['wait']); /* Bug#1343 */
 
         /* Judge whether the editedCases is too large and set session. */
-        $countInputVars = count($cases) * (count(explode(',', $this->config->testcase->custom->batchEditFields)) + 3);
+        $countInputVars  = count($cases) * (count(explode(',', $this->config->testcase->custom->batchEditFields)) + 3);
         $showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
         if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
 
diff --git a/module/testcase/model.php b/module/testcase/model.php
index b8f4f1ce1b..026eb169e9 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -202,6 +202,8 @@ class testcaseModel extends model
 
             $this->loadModel('score')->create('testcase', 'create', $caseID);
             $actionID = $this->loadModel('action')->create('case', $caseID, 'Opened');
+            if($this->app->openApp == 'project') $this->action->create('case', $caseID, 'linked2project', '', $this->session->PRJ);
+            if($this->app->openApp == 'execution') $this->action->create('case', $caseID, 'linked2execution', '', $this->session->execution);
         }
         if(!dao::isError()) $this->loadModel('score')->create('ajax', 'batchCreate');
     }
@@ -251,7 +253,8 @@ class testcaseModel extends model
             ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case=t2.id')
             ->leftJoin(TABLE_PROJECTSTORY)->alias('t3')->on('t3.story=t2.story')
             ->leftJoin(TABLE_STORY)->alias('t4')->on('t3.story=t4.id')
-            ->where('t2.product')->eq((int)$productID)
+            ->where('1=1')
+            ->beginIF(!empty((int)$productID))->andWhere('t2.product')->eq((int)$productID)->fi()
             ->beginIF($this->app->openApp == 'project')->andWhere('t1.project')->eq($this->session->project)->fi()
             ->beginIF($branch)->andWhere('t2.branch')->eq($branch)->fi()
             ->beginIF($moduleIdList)->andWhere('t2.module')->in($moduleIdList)->fi()
@@ -411,7 +414,7 @@ class testcaseModel extends model
         $cases = array();
         if($browseType == 'bymodule' or $browseType == 'all' or $browseType == 'wait')
         {
-            if($group == 'project')
+            if($this->app->openApp == 'project')
             {
                 $cases = $this->getModuleProjectCases($productID, $branch, $modules, $sort, $pager, $browseType, $auto);
             }
@@ -423,12 +426,14 @@ class testcaseModel extends model
         /* Cases need confirmed. */
         elseif($browseType == 'needconfirm')
         {
-            $cases = $this->dao->select('t1.*, t2.title AS storyTitle')->from(TABLE_CASE)->alias('t1')->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+            $cases = $this->dao->select('t1.*, t2.title AS storyTitle')->from(TABLE_CASE)->alias('t1')
+                ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+                ->leftJoin(TABLE_PROJECTCASE)->alias('t3')->on('t1.id = t3.case')
                 ->where("t2.status = 'active'")
                 ->andWhere('t1.deleted')->eq(0)
                 ->andWhere('t2.version > t1.storyVersion')
-                ->andWhere('t1.product')->eq($productID)
-                ->beginIF($this->lang->navGroup->testcase != 'qa')->andWhere('t1.project')->eq($this->session->project)->fi()
+                ->beginIF(!empty($productID))->andWhere('t1.product')->eq($productID)->fi()
+                ->beginIF($this->app->openApp == 'project')->andWhere('t3.project')->eq($this->session->project)->fi()
                 ->beginIF($branch)->andWhere('t1.branch')->eq($branch)->fi()
                 ->beginIF($modules)->andWhere('t1.module')->in($modules)->fi()
                 ->beginIF($auto != 'unit')->andWhere('t1.auto')->ne('unit')->fi()
@@ -1353,9 +1358,18 @@ class testcaseModel extends model
      */
     public function buildSearchForm($productID, $products, $queryID, $actionURL)
     {
-        $this->config->testcase->search['params']['product']['values'] = array($productID => $products[$productID], 'all' => $this->lang->testcase->allProduct);
-        $this->config->testcase->search['params']['module']['values']  = $this->loadModel('tree')->getOptionMenu($productID, $viewType = 'case');
-        $this->config->testcase->search['params']['lib']['values']     = $this->loadModel('caselib')->getLibraries();
+        $product = ($this->app->openApp == 'project' and empty($productID)) ? $products : array($productID => $products[$productID]);
+        $this->config->testcase->search['params']['product']['values'] = $product + array('all' => $this->lang->testcase->allProduct);
+
+        $module = $this->loadModel('tree')->getOptionMenu($productID, 'case', 0);
+        if(!$productID)
+        {
+            $module = array();
+            foreach($products as $id => $product) $module += $this->loadModel('tree')->getOptionMenu($id, 'case', 0);
+        }
+        $this->config->testcase->search['params']['module']['values'] = $module;
+
+        $this->config->testcase->search['params']['lib']['values'] = $this->loadModel('caselib')->getLibraries();
 
         if($this->session->currentProductType == 'normal')
         {
@@ -1429,7 +1443,7 @@ class testcaseModel extends model
                 if($canBatchAction)
                 {
                     $disabled = $canBeChanged ? '' : 'disabled';
-                    echo html::checkbox('caseIDList', array($case->id => ''), '', $disabled) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id));
+                    echo html::checkbox('caseIDList', array($case->id => ''), '', $disabled) . html::a(helper::createLink('testcase', 'view', "caseID=$case->id"), sprintf('%03d', $case->id), '', "data-app='{$this->app->openApp}'");
                 }
                 else
                 {
@@ -1444,7 +1458,7 @@ class testcaseModel extends model
             case 'title':
                 if($case->branch) echo "<span class='label label-info label-outline'>{$branches[$case->branch]}</span> ";
                 if($modulePairs and $case->module) echo "<span class='label label-gray label-badge'>{$modulePairs[$case->module]}</span> ";
-                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]") : html::a($caseLink, $case->title, null, "style='color: $case->color'")) : "<span style='color: $case->color'>$case->title</span>";
+                echo $canView ? ($fromCaseID ? html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->openApp}'") . html::a(helper::createLink('testcase', 'view', "caseID=$fromCaseID"), "[<i class='icon icon-share' title='{$this->lang->testcase->fromCase}'></i>#$fromCaseID]", '', "data-app='{$this->app->openApp}'") : html::a($caseLink, $case->title, null, "style='color: $case->color' data-app='{$this->app->openApp}'")) : "<span style='color: $case->color'>$case->title</span>";
                 break;
             case 'branch':
                 echo $branches[$case->branch];
@@ -1534,7 +1548,7 @@ class testcaseModel extends model
                     }
 
                     common::printIcon('testtask', 'results', "runID=0&caseID=$case->id", $case, 'list', '', '', 'iframe', true, "data-width='95%'");
-                    common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'run', '', 'runCase iframe', false, "data-width='95%'");
+                    common::printIcon('testtask', 'runCase', "runID=0&caseID=$case->id&version=$case->version", $case, 'list', 'play', '', 'runCase iframe', false, "data-width='95%'");
                     common::printIcon('testcase', 'edit',    "caseID=$case->id", $case, 'list');
                     if($this->config->testcase->needReview or !empty($this->config->testcase->forceReview)) common::printIcon('testcase', 'review',  "caseID=$case->id", $case, 'list', 'glasses', '', 'iframe');
                     common::printIcon('testcase', 'createBug', "product=$case->product&branch=$case->branch&extra=caseID=$case->id,version=$case->version,runID=", $case, 'list', 'bug', '', 'iframe', '', "data-width='90%'");
@@ -1678,7 +1692,6 @@ class testcaseModel extends model
         }
     }
 
-
     /**
      * Deal with the relationship between the case and project when edit the case.
      *
@@ -1707,8 +1720,10 @@ class testcaseModel extends model
         {
             /* If the new related story isn't linked the project, unlink the case. */
             $projects = $this->dao->select('project')->from(TABLE_PROJECTSTORY)->where('story')->eq($oldCase->story)->fetchAll('project');
+
+            $projectIdList = array_keys($projects);
             $this->dao->delete()->from(TABLE_PROJECTCASE)
-                ->where('project')->in(array_keys($projects))
+                ->where('project')->in()
                 ->andWhere('`case`')->eq($oldCase->id)
                 ->exec();
 
diff --git a/module/testcase/view/caseheader.html.php b/module/testcase/view/caseheader.html.php
index e522faa650..fe9d7a8078 100644
--- a/module/testcase/view/caseheader.html.php
+++ b/module/testcase/view/caseheader.html.php
@@ -1,4 +1,8 @@
 <?php js::set('flow', $config->global->flow);?>
+<?php $isProjectApp  = $this->app->openApp == 'project'?>
+<?php $currentModule = $isProjectApp ? 'project'  : 'testcase';?>
+<?php $currentMethod = $isProjectApp ? 'testcase' : 'browse';?>
+<?php $projectParam  = $isProjectApp ? "projectID={$this->session->project}&" : '';?>
 <?php if(!isset($branch)) $branch = 0;?>
 <?php if($config->global->flow == 'full'):?>
 <style>
@@ -19,8 +23,8 @@
           echo !empty($moduleID) ? $moduleName : $this->lang->tree->all;
           if(!empty($moduleID))
           {
-              $removeLink = $browseType == 'bymodule' ? $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
-              echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted'");
+              $removeLink = $browseType == 'bymodule' ? $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$browseType&param=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("caseModule")';
+              echo html::a($removeLink, "<i class='icon icon-sm icon-close'></i>", '', "class='text-muted' data-app='{$this->app->openApp}'");
           }
       }
       ?>
@@ -28,7 +32,7 @@
   </div>
   <div class='btn-toolbar pull-left'>
     <?php
-    $hasBrowsePriv = common::hasPriv('testcase', 'browse');
+    $hasBrowsePriv = $isProjectApp ? common::hasPriv('project', 'testcase') : common::hasPriv('testcase', 'browse');
     $hasGroupPriv  = common::hasPriv('testcase', 'groupcase');
     $hasZeroPriv   = common::hasPriv('story', 'zerocase');
     $hasUnitPriv   = common::hasPriv('testtask', 'browseunits');
@@ -40,15 +44,15 @@
     if(!$config->testcase->needReview and empty($config->testcase->forceReview) and $menuType == 'wait') continue;
     if($hasBrowsePriv and $menuType == 'QUERY')
     {
-        $searchBrowseLink = $this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=bySearch&param=%s");
+        $searchBrowseLink = $this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=bySearch&param=%s");
         $isBySearch       = $browseType == 'bysearch';
         include '../../common/view/querymenu.html.php';
     }
     elseif($hasBrowsePriv and ($menuType == 'all' or $menuType == 'needconfirm' or $menuType == 'wait'))
     {
-        echo html::a($this->createLink('testcase', 'browse', "productid=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab'");
+        echo html::a($this->createLink($currentModule, $currentMethod, $projectParam . "productID=$productID&branch=$branch&browseType=$menuType"), "<span class='text'>{$menuItem->text}</span>", '', "class='btn btn-link' id='{$menuType}Tab' data-app='{$this->app->openApp}'");
     }
-    elseif($hasBrowsePriv and $menuType == 'suite' and $lang->navGroup->testcase == 'qa')
+    elseif($hasBrowsePriv and $menuType == 'suite' and $this->app->openApp == 'qa')
     {
         $currentSuiteID = isset($suiteID) ? (int)$suiteID : 0;
         $currentSuite   = zget($suiteList, $currentSuiteID, '');
@@ -80,20 +84,20 @@
     }
     elseif($hasGroupPriv and $menuType == 'group')
     {
-        $groupBy  = isset($groupBy)  ? $groupBy : '';
-        $active   = !empty($groupBy) ? 'btn-active-text' : '';
+        $groupBy = isset($groupBy)  ? $groupBy : '';
+        $active  = !empty($groupBy) ? 'btn-active-text' : '';
 
         echo "<div id='groupTab' class='btn-group'>";
-        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active'");
+        echo html::a($this->createLink('testcase', 'groupCase', "productID=$productID&branch=$branch&groupBy=story"), "<span class='text'>{$lang->testcase->groupByStories}</span>", '', "class='btn btn-link $active' data-app='{$this->app->openApp}'");
         echo '</div>';
     }
     elseif($hasZeroPriv and $menuType == 'zerocase')
     {
-        echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&orderBy=id_desc&from={$this->lang->navGroup->testcase}"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab'");
+        echo html::a($this->createLink('story', 'zeroCase', "productID=$productID&orderBy=id_desc&from={$this->lang->navGroup->testcase}"), "<span class='text'>{$lang->story->zeroCase}</span>", '', "class='btn btn-link' id='zerocaseTab' data-app='{$this->app->openApp}'");
     }
     elseif($hasUnitPriv and $menuType == 'browseunits')
     {
-        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab'");
+        echo html::a($this->createLink('testtask', 'browseUnits', "productID=$productID"), "<span class='text'>{$lang->testcase->browseUnits}</span>", '', "class='btn btn-link' id='browseunitsTab' data-app='{$this->app->openApp}'");
     }
     ?>
     <?php endforeach;?>
@@ -132,7 +136,7 @@
       echo "<li $class>" . html::a($link, $lang->testcase->fileImport, '', $misc) . "</li>";
 
       $class = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
-      $misc  = common::hasPriv('testcase', 'importFromLib') ? '' : "class=disabled";
+      $misc  = common::hasPriv('testcase', 'importFromLib') ? "data-app='{$this->app->openApp}'" : "class=disabled";
       $link  = common::hasPriv('testcase', 'importFromLib') ?  $this->createLink('testcase', 'importFromLib', "productID=$productID&branch=$branch") : '#';
       echo "<li $class>" . html::a($link, $lang->testcase->importFromLib, '', $misc) . "</li>";
       ?>
@@ -144,31 +148,31 @@
     <div class='btn-group dropdown'>
       <?php
       $actionLink = $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule");
-      echo html::a($actionLink, "<i class='icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary'");
+      echo html::a($actionLink, "<i class='icon-plus'></i> " . $lang->testcase->create, '', "class='btn btn-primary' data-app='{$this->app->openApp}'");
       ?>
       <button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span></button>
       <ul class='dropdown-menu'>
         <li><?php echo html::a($actionLink, $lang->testcase->create);?></li>
-        <li><?php echo html::a($this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"), $lang->testcase->batchCreate);?></li>
+        <li><?php echo html::a($this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule"), $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'");?></li>
       </ul>
     </div>
     <?php endif;?>
     <?php if($this->app->rawMethod == 'browseunits' and common::canModify('product', $product)):?>
-      <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary'");?>
+      <?php common::printLink('testtask', 'importUnitResult', "product=$productID", "<i class='icon icon-import'></i> " . $lang->testtask->importUnitResult, '', "class='btn btn-primary' data-app='{$this->app->openApp}'");?>
     <?php endif;?>
     <?php else:?>
     <div class='btn-group dropdown-hover'>
       <?php
       $link = common::hasPriv('testcase', 'create') ? $this->createLink('testcase', 'create', "productID=$productID&branch=$branch&moduleID=$initModule") : '###';
       $disabled = common::hasPriv('testcase', 'create') ? '' : "disabled";
-      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled'");
+      echo html::a($link, "<i class='icon icon-plus'></i> {$lang->testcase->create} </span><span class='caret'>", '', "class='btn btn-primary $disabled' data-app='project'");
       ?>
       <ul class='dropdown-menu'>
         <?php $disabled = common::hasPriv('testcase', 'batchCreate') ? '' : "class='disabled'";?>
         <li <?php echo $disabled?>>
         <?php
         $batchLink = $this->createLink('testcase', 'batchCreate', "productID=$productID&branch=$branch&moduleID=$initModule");
-        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->testcase->batchCreate) . "</li>";
+        echo "<li>" . html::a($batchLink, "<i class='icon icon-plus'></i>" . $lang->testcase->batchCreate, '', "data-app='{$this->app->openApp}'") . "</li>";
         ?>
         </li>
       </ul>
diff --git a/module/testtask/control.php b/module/testtask/control.php
index a21bebfd58..b7d1f0550f 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -141,8 +141,15 @@ class testtask extends control
 
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
-        $this->loadModel('qa')->setMenu($this->products, $productID);
-        $this->app->rawModule = 'testcase';
+        if($this->app->openApp == 'project')
+        {
+            $this->loadModel('project')->setMenu($this->session->project);
+        }
+        else
+        {
+            $this->loadModel('qa')->setMenu($this->products, $productID);
+            $this->app->rawModule = 'testcase';
+        }
 
         /* Load pager. */
         if($browseType == 'newest') $recPerPage = '10';
diff --git a/module/tree/model.php b/module/tree/model.php
index 707be62826..a596e2e681 100644
--- a/module/tree/model.php
+++ b/module/tree/model.php
@@ -729,11 +729,14 @@ class treeModel extends model
         }
 
         /* Get module according to product. */
-        $productNum = count($products);
+        $productNum   = count($products);
+        $moduleName   = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+        $methodName   = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+        $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
         foreach($products as $id => $product)
         {
             $extra['productID'] = $id;
-            $link  = helper::createLink('testcase', 'browse', "productID=$id");
+            $link  = helper::createLink($moduleName, $methodName, $projectParam . "productID=$id");
             $menu .= "<li>" . html::a($link, $product, '_self', "id='product$id' data-app='project'");
 
             /* tree menu. */
@@ -1187,7 +1190,10 @@ class treeModel extends model
      */
     public function createCaseLink($type, $module)
     {
-        return html::a(helper::createLink('testcase', 'browse', "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}' data-app='{$this->app->openApp}'");
+        $moduleName   = $this->app->openApp == 'project' ? 'project'  : 'testcase';
+        $methodName   = $this->app->openApp == 'project' ? 'testcase' : 'browse';
+        $projectParam = $this->app->openApp == 'project' ? "projectID={$this->session->project}&" : '';
+        return html::a(helper::createLink($moduleName, $methodName, $projectParam . "root={$module->root}&branch=&type=byModule&param={$module->id}"), $module->name, '_self', "id='module{$module->id}' data-app='{$this->app->openApp}'");
     }
 
     /**