From 76895b87c822a3cd52b3b1bc359cf33435a02d9a Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Thu, 10 Mar 2022 14:38:27 +0800
Subject: [PATCH 1/3] * fix bug #20511

---
 extension/lite/my/ext/view/todo.calendar.html.hook.php | 3 ---
 1 file changed, 3 deletions(-)
 delete mode 100644 extension/lite/my/ext/view/todo.calendar.html.hook.php

diff --git a/extension/lite/my/ext/view/todo.calendar.html.hook.php b/extension/lite/my/ext/view/todo.calendar.html.hook.php
deleted file mode 100644
index 711e1b1184..0000000000
--- a/extension/lite/my/ext/view/todo.calendar.html.hook.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php
-$calendarHookFile = $app->getExtensionRoot() . 'biz/my/ext/view/todo.calendar.html.hook.php';
-if(file_exists($calendarHookFile)) include $calendarHookFile;

From cb8f6ca3757c0a60fdfa71ab327091218c313ef0 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Fri, 11 Mar 2022 10:38:23 +0800
Subject: [PATCH 2/3] * fix bug #20652

---
 extension/lite/my/ext/view/task.html.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/extension/lite/my/ext/view/task.html.php b/extension/lite/my/ext/view/task.html.php
index b240a99e6d..075b047e80 100644
--- a/extension/lite/my/ext/view/task.html.php
+++ b/extension/lite/my/ext/view/task.html.php
@@ -139,7 +139,6 @@
 
                     common::printIcon('task', 'recordEstimate', "taskID=$task->id", $task, 'list', 'time', '', 'iframe', true, '', '', $task->project);
                     common::printIcon('task', 'edit', "taskID=$task->id", $task, 'list', '', '', 'iframe', true, "data-width='95%'", '', $task->project);
-                    common::printIcon('task', 'batchCreate', "executionID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id&ifame=true", $task, 'list', 'split', '', 'iframe', true, "data-width='95%'", $this->lang->task->children, $task->project);
                 }
             }
             ?>

From 1c518b7a9b3cc8d347235cb9096eae98159bca42 Mon Sep 17 00:00:00 2001
From: Zongjun Lan <jasonlan@lucasgc.com>
Date: Fri, 11 Mar 2022 13:27:29 +0800
Subject: [PATCH 3/3] * fix bug #20643

---
 extension/lite/story/ext/view/batchedit.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/lite/story/ext/view/batchedit.html.php b/extension/lite/story/ext/view/batchedit.html.php
index 930f4e2b97..583db01602 100644
--- a/extension/lite/story/ext/view/batchedit.html.php
+++ b/extension/lite/story/ext/view/batchedit.html.php
@@ -51,7 +51,7 @@
         <tr>
           <td><?php echo $storyID . html::hidden("storyIdList[$storyID]", $storyID);?></td>
           <td class='text-left'>
-            <?php echo html::select("modules[$storyID]", isset($modules[$story->product][$story->branch]) ? $modules[$story->product][$story->branch] : array('0' => '/'), $story->module, "class='form-control chosen'");?>
+            <?php echo html::select("modules[$storyID]", isset($moduleList[$story->id]) ? $moduleList[$story->id] : array('0' => '/'), $story->module, "class='form-control chosen'");?>
           </td>
           <td title='<?php echo $story->title?>'>
             <div class="input-group">