From b32f2af9b77d008e040b8b313af42466f030ead3 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Wed, 9 Nov 2022 10:30:30 +0800
Subject: [PATCH]  * code for task #75236.

---
 module/doc/model.php                    | 2 +-
 module/execution/control.php            | 1 -
 module/execution/view/testtask.html.php | 5 +----
 module/project/view/testtask.html.php   | 5 +----
 module/testtask/model.php               | 2 +-
 5 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 48d24222c1..2ee7feff60 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -654,7 +654,7 @@ class docModel extends model
         if($version == $doc->version and ((empty($docContent->files) and $docFiles) or ($docContent->files and count(explode(',', trim($docContent->files, ','))) != count($docFiles))))
         {
             unset($docContent->id);
-            $doc->version        += 1;
+            $doc->version       += 1;
             $docContent->version = $doc->version;
             $docContent->files   = join(',', array_keys($docFiles));
             $this->dao->insert(TABLE_DOCCONTENT)->data($docContent)->exec();
diff --git a/module/execution/control.php b/module/execution/control.php
index 0079c3df66..5d9aaef886 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1240,7 +1240,6 @@ class execution extends control
      */
     public function testreport($executionID = 0, $objectType = 'execution', $extra = '', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        if($this->app->tab == 'project') $this->loadModel('project')->setMenu($this->session->project);
         echo $this->fetch('testreport', 'browse', "objectID=$executionID&objectType=$objectType&extra=$extra&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
     }
 
diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index aa1d7b993a..3c6ff064e9 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -115,10 +115,7 @@ $doneCount    = 0;
             {
                 common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
                 common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
-                if(common::hasPriv('execution', 'testreport'))
-                {
-                    echo html::a($this->createLink('execution', 'testreport', "executionID=$executionID&objctType=execution&extra=$task->id"), '<i class="icon-testreport-browse icon-summary"></i>', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="execution"');
-                }
+                common::printIcon('execution', 'testreport', "executionID=$executionID&objectType=execution&extra=$task->id", '', 'list', 'summary', '', '', false, "data-app='execution'", $this->lang->testreport->common);
                 common::printIcon('testtask', 'edit',   "taskID=$task->id", $task, 'list');
                 common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin');
             }
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 8fce5a0087..a735daadb3 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -105,10 +105,7 @@
             {
                 common::printIcon('testtask', 'cases',    "taskID=$task->id", $task, 'list', 'sitemap');
                 common::printIcon('testtask', 'linkCase', "taskID=$task->id", $task, 'list', 'link');
-                if(common::hasPriv('execution', 'testreport'))
-                {
-                    echo html::a($this->createLink('execution', 'testreport', "executionID=$task->execution&objectType=execution&extra=$task->id"), '<i class="icon-testreport-browse icon-summary"></i>', '', 'class="btn " title="' . $lang->testreport->browse . '" data-app="project"');
-                }
+                common::printIcon('project', 'testreport', "projectID=$task->project&objectType=project&extra=$task->id", '', 'list', 'summary', '', '', false, "data-app='project'", $this->lang->testreport->common);
                 common::printIcon('testtask', 'edit',   "taskID=$task->id", $task, 'list');
                 common::printIcon('testtask', 'delete', "taskID=$task->id", $task, 'list', 'trash', 'hiddenwin');
             }
diff --git a/module/testtask/model.php b/module/testtask/model.php
index d0e3767943..78ff2a7ad6 100755
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -2303,7 +2303,7 @@ class testtaskModel extends model
         $menu .= '<div id="action-divider">';
         $menu .= $this->buildMenu('testtask',   'cases',    $params, $task, 'browse', 'sitemap');
         $menu .= $this->buildMenu('testtask',   'linkCase', "$params&type=all&param=myQueryID", $task, 'browse', 'link');
-        $menu .= $this->buildMenu('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'browse', 'summary');
+        $menu .= $this->buildMenu('testreport', 'browse',   "objectID=$task->product&objectType=product&extra=$task->id", $task, 'browse', 'summary', '', '', false, '', $this->lang->testreport->common);
         $menu .= '</div>';
         $menu .= $this->buildMenu('testtask',   'view',     $params, $task, 'browse', 'list-alt', '', 'iframe', true, "data-width='90%'");
         $menu .= $this->buildMenu('testtask',   'edit',     $params, $task, 'browse');