From eaf5bd6c508a62574d30fbf31338b37ebcee3c37 Mon Sep 17 00:00:00 2001
From: zhengrunyu <zhenrunyu@easycorp.ltd>
Date: Thu, 30 Dec 2021 18:21:26 +0800
Subject: [PATCH] *Fix bug.

---
 module/productplan/js/batchedit.js         | 2 --
 module/productplan/js/edit.js              | 4 ++--
 module/productplan/model.php               | 8 ++++++--
 module/productplan/view/batchedit.html.php | 5 ++---
 module/productplan/view/edit.html.php      | 3 +--
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/productplan/js/batchedit.js b/module/productplan/js/batchedit.js
index 56390298a0..9c6b7dd997 100644
--- a/module/productplan/js/batchedit.js
+++ b/module/productplan/js/batchedit.js
@@ -7,8 +7,6 @@
  */
 function changeDate(planID)
 {
-    $("input[name='end[" + planID + "]']").val('');
-    $("input[name='begin[" + planID + "]']").val('');
     if($("#future"+planID).prop('checked'))
     {
         $("input[name='begin[" + planID + "]']").attr('disabled', 'disabled');
diff --git a/module/productplan/js/edit.js b/module/productplan/js/edit.js
index f65ed0e4c5..b3d05fdcca 100644
--- a/module/productplan/js/edit.js
+++ b/module/productplan/js/edit.js
@@ -96,8 +96,8 @@ $('#future').on('change', function()
 {
     if($(this).prop('checked'))
     {
-        $('#begin').attr('disabled', 'disabled').val('');
-        $('#end').val('').parents('tr').hide();
+        $('#begin').attr('disabled', 'disabled');
+        $('#end').parents('tr').hide();
     }
     else
     {
diff --git a/module/productplan/model.php b/module/productplan/model.php
index ebbc95694f..5520e788e0 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -676,6 +676,9 @@ class productplanModel extends model
             $plan->end    = $data->end[$planID] == '' ? '2030-01-01' : $data->end[$planID];
             $plan->status = $data->status[$planID];
             
+            if($plan->status == 'wait' and !isset($data->future[$planID])) $data->future[$planID] = 'on'; 
+            $isFuture = isset($data->future[$planID]) ? 1 : 0;
+
             if($oldPlans[$planID]->parent > 0)
             {
                 $parentPlan = $this->getByID($oldPlans[$planID]->parent);
@@ -690,10 +693,11 @@ class productplanModel extends model
             }
 
             if(empty($plan->title))die(js::alert(sprintf($this->lang->productplan->errorNoTitle, $planID)));
-            if($plan->begin == '2030-01-01' and $plan->status != 'wait') die(js::alert(sprintf($this->lang->productplan->errorNoBegin, $planID)));
-            if($plan->end   == '2030-01-01' and $plan->status != 'wait') die(js::alert(sprintf($this->lang->productplan->errorNoEnd, $planID)));
+            if(!$isFuture and $plan->begin == '2030-01-01') die(js::alert(sprintf($this->lang->productplan->errorNoBegin, $planID)));
+            if(!$isFuture and $plan->end == '2030-01-01') die(js::alert(sprintf($this->lang->productplan->errorNoEnd, $planID)));
             if($plan->begin > $plan->end and ($plan->begin != '2030-01-01' and $plan->end != '2030-01-01')) die(js::alert(sprintf($this->lang->productplan->beginGeEnd, $planID)));
 
+
             foreach($extendFields as $extendField)
             {
                 $plan->{$extendField->field} = $this->post->{$extendField->field}[$planID];
diff --git a/module/productplan/view/batchedit.html.php b/module/productplan/view/batchedit.html.php
index fda9bb834d..a9693db645 100644
--- a/module/productplan/view/batchedit.html.php
+++ b/module/productplan/view/batchedit.html.php
@@ -53,8 +53,7 @@
           <?php if($plan->parent != -1):?>
           <td><?php echo html::select("status[$plan->id]", array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' onchange='setPlanStatus($plan->id, this.value)'");?></td>
           <?php else:?>
-          <td><?php echo zget($lang->productplan->statusList, $plan->status);?></td>
-          <?php echo html::hidden("status[$plan->id]", $plan->status);?>
+          <td><?php echo html::select("status[$plan->id]", array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' disabled onchange='setPlanStatus($plan->id, this.value)'");?></td>
           <?php endif;?>
           <?php $required = $plan->status != 'wait' ? 'required' : '' ;?>
           <?php $disabled = ($plan->begin == '2030-01-01' || $plan->end == '2030-01-01') ? 'disabled="disabled"' : '';?>
@@ -63,7 +62,7 @@
           <td class=<?php echo $required;?>><?php echo html::input("begin[$plan->id]", $plan->begin, "class='form-control form-date' $disabled");?></td>
           <td class=<?php echo $required;?>><?php echo html::input("end[$plan->id]", $plan->end, "class='form-control form-date' $disabled");?></td>
           <?php $hidden = $plan->status != 'wait' ? 'hidden' : '';?>
-          <td><div class='checkbox-primary <?php echo $hidden;?>'><input type='checkbox' id="future<?php echo $plan->id; ?>" name='future<?php echo $plan->id; ?>' <?php echo $isChecked;?> onclick="changeDate(<?php echo $plan->id;?>);"/><label for='future<?php echo $plan->id; ?>'><?php echo $lang->productplan->future;?></label></div></td>
+          <td><div class='checkbox-primary <?php echo $hidden;?>'><input type='checkbox' id="future<?php echo $plan->id; ?>" name='future[<?php echo $plan->id; ?>]' <?php echo $isChecked;?> onclick="changeDate(<?php echo $plan->id;?>);"/><label for='future<?php echo $plan->id; ?>'><?php echo $lang->productplan->future;?></label></div></td>
           <?php foreach($extendFields as $extendField) echo "<td" . (($extendField->control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, $plan, $extendField->field . "[{$plan->id}]") . "</td>";?>
         </tr>
         <?php endforeach;?>
diff --git a/module/productplan/view/edit.html.php b/module/productplan/view/edit.html.php
index 134c8b898e..37ddaa9172 100644
--- a/module/productplan/view/edit.html.php
+++ b/module/productplan/view/edit.html.php
@@ -43,8 +43,7 @@
             <?php if($plan->parent != -1):?>
             <td><?php echo html::select('status', array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' onchange='setPlanStatus()'");?></td>
             <?php else:?>
-            <td><?php echo zget($lang->productplan->statusList, $plan->status);?></td>
-            <?php echo html::hidden('status', $plan->status);?>
+            <td><?php echo html::select('status', array_slice($lang->productplan->statusList,($plan->status == 'wait' ? 0 : 1)), $plan->status, "class='form-control chosen' disabled onchange='setPlanStatus()'");?></td>
             <?php endif;?>
           </tr>
           <tr>