From eb54393450bef967c8ee24aebe30a342e6fc218f Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 21 Mar 2022 16:26:28 +0800
Subject: [PATCH 1/3] * Fix bug #20808.

---
 module/productplan/control.php        | 12 ++++++------
 module/productplan/view/view.html.php | 10 ++--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/module/productplan/control.php b/module/productplan/control.php
index 4ca9daa80f..8dfb9db960 100644
--- a/module/productplan/control.php
+++ b/module/productplan/control.php
@@ -444,14 +444,14 @@ class productplan extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->productplan->confirmStart, $this->createLink('productplan', 'start', "planID=$planID&confirm=yes"), 'parent'));
+            return print(js::confirm($this->lang->productplan->confirmStart, $this->createLink('productplan', 'start', "planID=$planID&confirm=yes")));
         }
         else
         {
             $this->productplan->updateStatus($planID, 'doing', 'started');
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::reload('parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::reload('parent'));
         }
     }
 
@@ -467,14 +467,14 @@ class productplan extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->productplan->confirmFinish, $this->createLink('productplan', 'finish', "planID=$planID&confirm=yes"), 'parent'));
+            return print(js::confirm($this->lang->productplan->confirmFinish, $this->createLink('productplan', 'finish', "planID=$planID&confirm=yes")));
         }
         else
         {
             $this->productplan->updateStatus($planID, 'done', 'finished');
 
-            if(dao::isError()) die(js::error(dao::getError()));
-            die(js::reload('parent'));
+            if(dao::isError()) return print(js::error(dao::getError()));
+            return print(js::reload('parent'));
         }
     }
 
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 6e49bf5456..0e5c47810a 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -47,14 +47,8 @@
         {
             $attr       = "target='hiddenwin'";
             $isOnlyBody = false;
-            $class      = '';
-            if($plan->begin == $config->productplan->future or $plan->end == $config->productplan->future)
-            {
-                $class      = 'iframe';
-                $attr       = "data-toggle='modal' data-id='{$plan->id}' data-width='550px'";
-                $isOnlyBody = true;
-            }
-            $class = $plan->status == 'wait' ? $class : 'disabled';
+            $class      = $plan->status == 'wait' ? '' : 'disabled';
+
             common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', $isOnlyBody, $plan);
             $class = $plan->status == 'doing' ? '' : 'disabled';
             common::printLink('productplan', 'finish', "planID=$plan->id", "<i class='icon-checked'></i>{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'", '', false, $plan);

From 710805bcb03b1115f3d65ec77947edd1940bc1da Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 21 Mar 2022 16:35:54 +0800
Subject: [PATCH 2/3] Optimize code.

---
 module/productplan/view/view.html.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 0e5c47810a..8a47be3eb2 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -46,10 +46,9 @@
         if($plan->parent >= 0)
         {
             $attr       = "target='hiddenwin'";
-            $isOnlyBody = false;
             $class      = $plan->status == 'wait' ? '' : 'disabled';
 
-            common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', $isOnlyBody, $plan);
+            common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', false, $plan);
             $class = $plan->status == 'doing' ? '' : 'disabled';
             common::printLink('productplan', 'finish', "planID=$plan->id", "<i class='icon-checked'></i>{$lang->productplan->finishAB}", '', "class='btn btn-link {$class}' target='hiddenwin' title='{$lang->productplan->finish}'", '', false, $plan);
             $class = $plan->status !== 'closed' ? 'iframe' : 'disabled';

From 8f09a4957c806dd81ed4efad425fec473747f652 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Mon, 21 Mar 2022 16:37:56 +0800
Subject: [PATCH 3/3] Optimize code.

---
 module/productplan/view/view.html.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index 8a47be3eb2..2468ae1fd1 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -45,8 +45,8 @@
 
         if($plan->parent >= 0)
         {
-            $attr       = "target='hiddenwin'";
-            $class      = $plan->status == 'wait' ? '' : 'disabled';
+            $attr  = "target='hiddenwin'";
+            $class = $plan->status == 'wait' ? '' : 'disabled';
 
             common::printLink('productplan', 'start', "planID=$plan->id", "<i class='icon-play'></i>{$lang->productplan->startAB}", '', "class='btn btn-link {$class}'{$attr} title='{$lang->productplan->start}'", '', false, $plan);
             $class = $plan->status == 'doing' ? '' : 'disabled';