From 1e1ce390962ffe8087ac31498c6a24fc5bfd4a77 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Wed, 6 Jul 2022 06:18:09 +0000
Subject: [PATCH] * Fix bug #24736 #24738 #24745 #24748 #24844 #24849.

---
 module/bug/view/create.html.php      | 2 +-
 module/bug/view/edit.html.php        | 2 +-
 module/my/view/testcase.html.php     | 2 +-
 module/program/view/project.html.php | 2 +-
 module/story/view/create.html.php    | 2 +-
 module/story/view/edit.html.php      | 2 +-
 module/task/model.php                | 2 +-
 module/testcase/view/create.html.php | 2 +-
 module/testcase/view/edit.html.php   | 2 +-
 module/testtask/model.php            | 2 +-
 module/user/view/testcase.html.php   | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 8bd7efe16f..db37565d41 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -69,7 +69,7 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
                     echo "<span class='input-group-addon'>";
                     echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                     echo '&nbsp; ';
-                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' onclick='loadProductModules($productID)'");
+                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='$lang->refresh' onclick='loadProductModules($productID)'");
                     echo '</span>';
                 }
                 ?>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 58d28ab725..34330d2e23 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -111,7 +111,7 @@ if($this->app->tab == 'project')   js::set('objectID', $bug->project);
                         echo "<span class='input-group-addon'>";
                         echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=bug&currentModuleID=0&branch=$bug->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                         echo '&nbsp; ';
-                        echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' onclick='loadProductModules($productID)'");
+                        echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='$lang->refresh' onclick='loadProductModules($productID)'");
                         echo '</span>';
                     }
                     ?>
diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php
index 6a3bb26041..6500b5e591 100644
--- a/module/my/view/testcase.html.php
+++ b/module/my/view/testcase.html.php
@@ -98,7 +98,7 @@
           <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><?php echo helper::isZeroDate($case->lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?></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'>
diff --git a/module/program/view/project.html.php b/module/program/view/project.html.php
index f1b60b08e4..284d1d94ed 100644
--- a/module/program/view/project.html.php
+++ b/module/program/view/project.html.php
@@ -35,7 +35,7 @@ js::set('browseType', $browseType);
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->project->empty;?></span>
-        <?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
+        <?php if($browseType == 'all') common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
       </p>
     </div>
     <?php else:?>
diff --git a/module/story/view/create.html.php b/module/story/view/create.html.php
index 44ac11c4cf..65c765a56d 100644
--- a/module/story/view/create.html.php
+++ b/module/story/view/create.html.php
@@ -60,7 +60,7 @@
                     echo "<div class='input-group-addon'>";
                     echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=story&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='90%'");
                     echo '&nbsp; ';
-                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' onclick='loadProductModules($productID)'");
+                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='refresh' onclick='loadProductModules($productID)'");
                     echo '</div>';
                 }
                 ?>
diff --git a/module/story/view/edit.html.php b/module/story/view/edit.html.php
index 12518c5a8c..d3bed5546f 100644
--- a/module/story/view/edit.html.php
+++ b/module/story/view/edit.html.php
@@ -106,7 +106,7 @@
                       echo "<span class='input-group-addon'>";
                       echo html::a($this->createLink('tree', 'browse', "rootID=$story->product&view=story&currentModuleID=0&branch=$story->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                       echo '&nbsp; ';
-                      echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' onclick='loadProductModules($story->product)'");
+                      echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='$lang->refresh' onclick='loadProductModules($story->product)'");
                       echo '</span>';
                   }
                   ?>
diff --git a/module/task/model.php b/module/task/model.php
index ffc675aa33..f80f4c7210 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -3584,7 +3584,7 @@ class taskModel extends model
                 echo zget($users, $task->lastEditedBy);
                 break;
             case 'lastEditedDate':
-                echo substr($task->lastEditedDate, 5, 11);
+                echo helper::isZeroDate($task->lastEditedDate) ? '' : substr($task->lastEditedDate, 5, 11);
                 break;
             case 'activatedDate':
                 echo helper::isZeroDate($task->activatedDate) ? '' : substr($task->activatedDate, 5, 11);
diff --git a/module/testcase/view/create.html.php b/module/testcase/view/create.html.php
index cbebdab3c9..dcf447e638 100644
--- a/module/testcase/view/create.html.php
+++ b/module/testcase/view/create.html.php
@@ -56,7 +56,7 @@
                 {
                     echo "<span class='input-group-addon'>";
                     echo html::a($this->createLink('tree', 'browse', "rootID=$productID&view=case&currentModuleID=0&branch=$branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
-                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "id='refresh' class='refresh' onclick='loadProductModules($productID)'");
+                    echo html::a("javascript:void(0)", $lang->refreshIcon, '', "id='refresh' class='refresh' title='$lang->refresh' onclick='loadProductModules($productID)'");
                     echo '</span>';
                 }
                 ?>
diff --git a/module/testcase/view/edit.html.php b/module/testcase/view/edit.html.php
index 6ea8b49783..449d189d30 100644
--- a/module/testcase/view/edit.html.php
+++ b/module/testcase/view/edit.html.php
@@ -164,7 +164,7 @@
                       echo "<span class='input-group-addon'>";
                       echo html::a($this->createLink('tree', 'browse', "rootID=$libID&view=caselib&currentModuleID=0&branch=$case->branch", '', true), $lang->tree->manage, '', "class='text-primary' data-toggle='modal' data-type='iframe' data-width='95%'");
                       echo '&nbsp; ';
-                      echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' onclick='loadLibModules($libID)'");
+                      echo html::a("javascript:void(0)", $lang->refreshIcon, '', "class='refresh' title='$lang->refresh' onclick='loadLibModules($libID)'");
                       echo '</span>';
                   }
                   ?>
diff --git a/module/testtask/model.php b/module/testtask/model.php
index 5366c9f16c..26ed83ef72 100644
--- a/module/testtask/model.php
+++ b/module/testtask/model.php
@@ -1571,7 +1571,7 @@ class testtaskModel extends model
                 echo zget($users, $run->lastRunner);
                 break;
             case 'lastRunDate':
-                if(!helper::isZeroDate($run->lastRunDate)) echo date(DT_MONTHTIME1, strtotime($run->lastRunDate));
+                echo helper::isZeroDate($run->lastRunDate) ? '' : substr($run->lastRunDate, 5, 11);
                 break;
             case 'lastRunResult':
                 $lastRunResultText = $run->lastRunResult ? zget($this->lang->testcase->resultList, $run->lastRunResult, $run->lastRunResult) : $this->lang->testcase->unexecuted;
diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php
index 2563327df3..ecc6caf4cb 100755
--- a/module/user/view/testcase.html.php
+++ b/module/user/view/testcase.html.php
@@ -55,7 +55,7 @@
           <td><?php echo $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><?php echo helper::isZeroDate($case->lastRunDate) ? '' : substr($case->lastRunDate, 5, 11);?></td>
           <td class='<?php echo $case->lastRunResult;?>'><?php if($case->lastRunResult) echo $lang->testcase->resultList[$case->lastRunResult];?></td>
           <td class='<?php echo $case->status;?>'><?php echo $this->processStatus('testcase', $case);?></td>
         </tr>