From 7fe4729a580daf923327ef3cb708de6c285ad5ea Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 14 Apr 2022 16:58:37 +0800
Subject: [PATCH 1/3] * Fix bug #17353.

---
 module/todo/js/view.js         |  5 +++++
 module/todo/lang/en.php        |  1 +
 module/todo/lang/zh-cn.php     |  1 +
 module/todo/view/view.html.php | 20 ++++++--------------
 4 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index 80796b6858..b8cbb096b1 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -41,6 +41,11 @@ $(function()
     {
         var onlybody  = config.onlybody == 'yes';
         var productID = $('#bugProduct').val();
+        if(!productID)
+        {
+            alert(selectProduct);
+            return false;
+        }
         var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
 
         if(!onlybody) window.parent.$.apps.open(link, 'qa');
diff --git a/module/todo/lang/en.php b/module/todo/lang/en.php
index 54481dad81..c3a58f7db6 100644
--- a/module/todo/lang/en.php
+++ b/module/todo/lang/en.php
@@ -113,6 +113,7 @@ $lang->todo->noTodo         = 'No todos of this type.';
 $lang->todo->noAssignedTo   = "The AssignedTo should not be empty.";
 $lang->todo->unfinishedTodo = 'The todos of ID %s are not finished, and can not close.';
 $lang->todo->today          = 'Todo Today';
+$lang->todo->selectProduct  = "Please select a product";
 
 $lang->todo->periods['all']             = 'Assigned To Yourself';
 $lang->todo->periods['before']          = 'Unfinished';
diff --git a/module/todo/lang/zh-cn.php b/module/todo/lang/zh-cn.php
index 1b5124f5fa..5fb2578c24 100644
--- a/module/todo/lang/zh-cn.php
+++ b/module/todo/lang/zh-cn.php
@@ -113,6 +113,7 @@ $lang->todo->noTodo         = '该类型没有待办事务';
 $lang->todo->noAssignedTo   = '被指派人不能为空';
 $lang->todo->unfinishedTodo = '待办ID %s 不是完成状态，不能关闭。';
 $lang->todo->today          = '今日待办';
+$lang->todo->selectProduct  = "请选择产品";
 
 $lang->todo->periods['all']             = '指派自己';
 $lang->todo->periods['before']          = '未完';
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index f7540d8330..2490c9eb92 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -209,7 +209,7 @@
         <h4 class="modal-title"><?php echo $lang->execution->selectExecution;?></h4>
       </div>
       <div class="modal-body">
-        <?php if((empty($projects) and $config->systemMode == 'new') or (empty($executions) and $config->systemMode == 'classic')):?>
+        <?php if(empty($executions) and $config->systemMode == 'classic'):?>
         <div class="table-empty-tip">
           <p>
             <span class="text-muted"><?php echo $lang->project->empty;?></span>
@@ -271,36 +271,28 @@
         <h4 class="modal-title"><?php echo $lang->product->select;?></h4>
       </div>
       <div class="modal-body">
-        <?php if(empty($projects) and $config->systemMode == 'new'):?>
-        <div class="table-empty-tip">
-          <p>
-            <span class="text-muted"><?php echo $lang->project->empty;?></span>
-            <?php echo html::a("javascript:createProject()", "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
-          </p>
-        </div>
-        <?php else:?>
         <table align='center' class='table table-form'>
+          <tr>
+            <th><?php echo $lang->todo->product;?></th>
+            <td id='productIdBox'><?php echo html::select('bugProduct', $projectProducts, '', "class='form-control chosen'");?></td>
+          </tr>
           <?php if($config->systemMode == 'new'):?>
           <tr>
             <th><?php echo $lang->todo->project;?></th>
             <td><?php echo html::select('bugProject', $projects, '', "class='form-control chosen' onchange=getProductByProject(this.value);");?></td>
           </tr>
           <?php endif;?>
-          <tr>
-            <th><?php echo $lang->todo->product;?></th>
-            <td id='productIdBox'><?php echo html::select('bugProduct', $projectProducts, '', "class='form-control chosen'");?></td>
-          </tr>
           <tr>
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?></td>
           </tr>
         </table>
-        <?php endif;?>
       </div>
     </div>
   </div>
 </div>
 <?php js::set('todoID', $todo->id);?>
 <?php js::set('selectExecution', $lang->execution->selectExecution);?>
+<?php js::set('selectProduct', $lang->todo->selectProduct);?>
 <script>
 $(function() {parent.$('body.hide-modal-close').removeClass('hide-modal-close'); })
 </script>

From 40aaa976810fc52064a9393b7627af95034e8991 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Thu, 14 Apr 2022 17:05:38 +0800
Subject: [PATCH 2/3] * Fix bug #17353.

---
 module/todo/view/view.html.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index 2490c9eb92..cdc4e6c7fa 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -209,14 +209,6 @@
         <h4 class="modal-title"><?php echo $lang->execution->selectExecution;?></h4>
       </div>
       <div class="modal-body">
-        <?php if(empty($executions) and $config->systemMode == 'classic'):?>
-        <div class="table-empty-tip">
-          <p>
-            <span class="text-muted"><?php echo $lang->project->empty;?></span>
-            <?php echo html::a("javascript:" . ($config->systemMode == 'new' ? "createProject()" : "createExecution()"), "<i class='icon icon-plus'></i> " . $lang->project->create, '', "class='btn btn-info'");?>
-          </p>
-        </div>
-        <?php else:?>
         <table align='center' class='table table-form'>
           <?php if($config->systemMode == 'new'):?>
           <tr>
@@ -232,7 +224,6 @@
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['task'], "id='toTaskButton'", 'btn btn-primary');?></td>
           </tr>
         </table>
-        <?php endif;?>
       </div>
     </div>
   </div>

From e6ceaf1201244243aef77241f028dfac3be28693 Mon Sep 17 00:00:00 2001
From: zhouxudong <zhouxudong@easycorp.ltd>
Date: Fri, 15 Apr 2022 09:05:10 +0800
Subject: [PATCH 3/3] * Fix bug #17353.

---
 module/todo/js/view.js         | 2 +-
 module/todo/view/view.html.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/todo/js/view.js b/module/todo/js/view.js
index b8cbb096b1..224695541b 100644
--- a/module/todo/js/view.js
+++ b/module/todo/js/view.js
@@ -46,8 +46,8 @@ $(function()
             alert(selectProduct);
             return false;
         }
-        var link      = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
 
+        var link = createLink('bug', 'create', 'productID=' + productID + '&branch=0&extras=todoID=' + todoID, config.defaultView, onlybody);
         if(!onlybody) window.parent.$.apps.open(link, 'qa');
         if(onlybody) location.href = link;
     })
diff --git a/module/todo/view/view.html.php b/module/todo/view/view.html.php
index cdc4e6c7fa..2fcf9715a0 100644
--- a/module/todo/view/view.html.php
+++ b/module/todo/view/view.html.php
@@ -263,16 +263,16 @@
       </div>
       <div class="modal-body">
         <table align='center' class='table table-form'>
-          <tr>
-            <th><?php echo $lang->todo->product;?></th>
-            <td id='productIdBox'><?php echo html::select('bugProduct', $projectProducts, '', "class='form-control chosen'");?></td>
-          </tr>
           <?php if($config->systemMode == 'new'):?>
           <tr>
             <th><?php echo $lang->todo->project;?></th>
             <td><?php echo html::select('bugProject', $projects, '', "class='form-control chosen' onchange=getProductByProject(this.value);");?></td>
           </tr>
           <?php endif;?>
+          <tr>
+            <th><?php echo $lang->todo->product;?></th>
+            <td id='productIdBox'><?php echo html::select('bugProduct', $projectProducts, '', "class='form-control chosen'");?></td>
+          </tr>
           <tr>
             <td colspan='2' class='text-center'><?php echo html::commonButton($lang->todo->reasonList['bug'], "id='toBugButton'", 'btn btn-primary');?></td>
           </tr>