From 94045515a0a4bc565f80eafac5a73038885fabc4 Mon Sep 17 00:00:00 2001
From: wangyidong <wyd621@163.com>
Date: Thu, 1 Apr 2021 10:26:52 +0800
Subject: [PATCH]  * fix bug #11064.

---
 module/todo/lang/zh-cn.php     |  1 +
 module/todo/view/view.html.php | 54 +++++++++++++++++++---------------
 2 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index d26736be2e..29a5f6b1c2 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -68,6 +68,7 @@ $lang->todo->finishedDate = '完成时间';
 $lang->todo->closedBy     = '由谁关闭';
 $lang->todo->closedDate   = '关闭时间';
 $lang->todo->deadline     = '过期时间';
+$lang->todo->deleted      = '已删除';
 
 $lang->todo->every        = '间隔';
 $lang->todo->specify      = '指定';
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index a9c7c7547f..4ade094eed 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -19,6 +19,9 @@
     <div class="page-title">
       <span class="label label-id"><?php echo $todo->id?></span>
       <span class='text' title='<?php echo $todo->name;?>'><?php echo $todo->name;?></span>
+      <?php if($todo->deleted):?>
+      <span class='label label-danger'><?php echo $lang->todo->deleted;?></span>
+      <?php endif;?>
     </div>
   </div>
 </div>
@@ -56,34 +59,37 @@
             $browseLink = $this->createLink('user', 'todo', "userID=$user->id");
         }
 
-        if($this->app->user->admin or ($this->app->user->account == $todo->account) or ($this->app->user->account == $todo->assignedTo))
+        if(!$todo->deleted)
         {
-            if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
-            if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
-            if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
-            common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
-            common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
-
-            if($todo->status != 'done' && $todo->status != 'closed')
+            if($this->app->user->admin or ($this->app->user->account == $todo->account) or ($this->app->user->account == $todo->assignedTo))
             {
-                echo "<div class='btn-group dropup'>";
-                echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
-                $createStoryPriv = common::hasPriv('story', 'create');
-                $createTaskPriv  = common::hasPriv('task', 'create');
-                $createBugPriv   = common::hasPriv('bug', 'create');
-                if($createStoryPriv or $createTaskPriv or $createBugPriv)
+                if($todo->status == 'wait') common::printLink('todo', 'start', "todoID=$todo->id", "<i class='icon icon-play'></i>", 'hiddenwin', "title='{$lang->todo->start}' class='btn showinonlybody'");
+                if($todo->status == 'done' || $todo->status == 'closed') common::printLink('todo', 'activate', "todoID=$todo->id", "<i class='icon icon-magic'></i>", 'hiddenwin', "title='{$lang->todo->activate}' class='btn showinonlybody'");
+                if($todo->status == 'done') common::printLink('todo', 'close', "todoID=$todo->id", "<i class='icon icon-off'></i>", 'hiddenwin', "title='{$lang->todo->close}' class='btn showinonlybody'");
+                common::printLink('todo', 'edit', "todoID=$todo->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->todo->edit}' class='btn showinonlybody'");
+                common::printLink('todo', 'delete', "todoID=$todo->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->todo->delete}' class='btn showinonlybody'");
+
+                if($todo->status != 'done' && $todo->status != 'closed')
                 {
-                    $isonlybody = isonlybody();
-                    unset($_GET['onlybody']);
-                    echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'>{$this->lang->more}<span class='caret'></span></button>";
-                    echo "<ul class='dropdown-menu pull-right' role='menu'>";
-                    if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
-                    if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#executionModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
-                    if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#projectProductModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
-                    echo "</ul>";
-                    if($isonlybody) $_GET['onlybody'] = 'yes';
+                    echo "<div class='btn-group dropup'>";
+                    echo html::a($this->createLink('todo', 'finish', "id=$todo->id", 'html', true), "<i class='icon icon-checked'></i>", 'hiddenwin', "title='{$lang->todo->finish}' class='btn showinonlybody btn-success'");
+                    $createStoryPriv = common::hasPriv('story', 'create');
+                    $createTaskPriv  = common::hasPriv('task', 'create');
+                    $createBugPriv   = common::hasPriv('bug', 'create');
+                    if($createStoryPriv or $createTaskPriv or $createBugPriv)
+                    {
+                        $isonlybody = isonlybody();
+                        unset($_GET['onlybody']);
+                        echo "<button type='button' class='btn btn-success dropdown-toggle' data-toggle='dropdown'>{$this->lang->more}<span class='caret'></span></button>";
+                        echo "<ul class='dropdown-menu pull-right' role='menu'>";
+                        if($createStoryPriv) echo '<li>' . html::a('###', $lang->todo->reasonList['story'], '', "data-toggle='modal' data-target='#productModal' data-backdrop='false' data-moveable='true' data-position='center' id='toStoryLink'") . '</li>';
+                        if($createTaskPriv)  echo '<li>' . html::a('###', $lang->todo->reasonList['task'], '', "data-toggle='modal' data-target='#executionModal' data-backdrop='false' data-moveable='true' data-position='center' id='toTaskLink'") . '</li>';
+                        if($createBugPriv)   echo '<li>' . html::a('###', $lang->todo->reasonList['bug'], '', "data-toggle='modal' data-target='#projectProductModal' data-backdrop='false' data-moveable='true' data-position='center' id='toBugLink'") . '</li>';
+                        echo "</ul>";
+                        if($isonlybody) $_GET['onlybody'] = 'yes';
+                    }
+                    echo "</div>";
                 }
-                echo "</div>";
             }
         }
         common::printRPN($browseLink);