From e8d19aa976193f1aeebd0078f52c7e9d0df0bef4 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Wed, 21 Jun 2023 09:27:06 +0800
Subject: [PATCH] * Change the logic of the judgement pop-window.

---
 module/task/ui/activate.html.php       | 2 +-
 module/task/ui/cancel.html.php         | 2 +-
 module/task/ui/close.html.php          | 2 +-
 module/task/ui/create.html.php         | 4 +---
 module/task/ui/editeffort.html.php     | 2 +-
 module/task/ui/finish.html.php         | 2 +-
 module/task/ui/pause.html.php          | 2 +-
 module/task/ui/recordworkhour.html.php | 2 +-
 module/task/ui/restart.html.php        | 2 +-
 module/task/ui/start.html.php          | 2 +-
 10 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/module/task/ui/activate.html.php b/module/task/ui/activate.html.php
index fe7ee61a19..ec62d7d97b 100644
--- a/module/task/ui/activate.html.php
+++ b/module/task/ui/activate.html.php
@@ -92,7 +92,7 @@ formPanel
     set::title($lang->task->activateAction),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     set::actions(array('submit')),
     set::submitBtnText($lang->task->activate),
     to::headingActions
diff --git a/module/task/ui/cancel.html.php b/module/task/ui/cancel.html.php
index 4535b9d8f2..f474a00297 100644
--- a/module/task/ui/cancel.html.php
+++ b/module/task/ui/cancel.html.php
@@ -17,7 +17,7 @@ formPanel
     set::title($lang->task->cancelAction),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     set::actions(array('submit')),
     set::submitBtnText($lang->task->cancel),
     to::headingActions
diff --git a/module/task/ui/close.html.php b/module/task/ui/close.html.php
index d6ba921ccc..94cf576baf 100644
--- a/module/task/ui/close.html.php
+++ b/module/task/ui/close.html.php
@@ -17,7 +17,7 @@ formPanel
     set::title($lang->task->closeAction),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     set::actions(array('submit')),
     set::submitBtnText($lang->task->close),
     to::headingActions
diff --git a/module/task/ui/create.html.php b/module/task/ui/create.html.php
index 1aa7ea64d8..739c4994b4 100644
--- a/module/task/ui/create.html.php
+++ b/module/task/ui/create.html.php
@@ -265,7 +265,7 @@ if($execution->lifetime != 'ops' and !in_array($execution->attribute, array('req
 
 $afterCreateRow = '';
 /* Ct redirect within pop-ups. */
-if(!isonlybody())
+if(!isAjaxRequest('modal'))
 {
     $afterRow = formGroup
     (
@@ -494,6 +494,4 @@ formPanel
 
 
 /* ====== Render page ====== */
-
-$pageType = isonlybody() ? 'modal' : 'page';
 render();
diff --git a/module/task/ui/editeffort.html.php b/module/task/ui/editeffort.html.php
index f0322b3ba3..79b399bfe0 100644
--- a/module/task/ui/editeffort.html.php
+++ b/module/task/ui/editeffort.html.php
@@ -19,7 +19,7 @@ formPanel
     set::title($lang->task->editEffort),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     to::headingActions
     (
         entityLabel
diff --git a/module/task/ui/finish.html.php b/module/task/ui/finish.html.php
index 22e2e49100..86343447f2 100644
--- a/module/task/ui/finish.html.php
+++ b/module/task/ui/finish.html.php
@@ -81,7 +81,7 @@ else
         set::title($lang->task->finishAction),
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
-        set::shadow(!isonlybody()),
+        set::shadow(!isAjaxRequest('modal')),
         set::actions(array('submit')),
         set::submitBtnText($lang->task->finish),
         to::heading
diff --git a/module/task/ui/pause.html.php b/module/task/ui/pause.html.php
index 3a5df9f98d..81c054a412 100644
--- a/module/task/ui/pause.html.php
+++ b/module/task/ui/pause.html.php
@@ -20,7 +20,7 @@ formPanel
     set::title($lang->task->pauseAction),
     set::headingClass('status-heading'),
     set::titleClass('form-label .form-grid'),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     set::actions(array('submit')),
     set::submitBtnText($lang->task->pause),
     to::headingActions
diff --git a/module/task/ui/recordworkhour.html.php b/module/task/ui/recordworkhour.html.php
index 7631d97616..0dcd30296c 100644
--- a/module/task/ui/recordworkhour.html.php
+++ b/module/task/ui/recordworkhour.html.php
@@ -68,7 +68,7 @@ if($efforts)
 formBatchPanel
 (
     set::title($lang->task->addEffort),
-    set::shadow(!isonlybody()),
+    set::shadow(!isAjaxRequest('modal')),
     set::actions(array('submit')),
     formBatchItem
     (
diff --git a/module/task/ui/restart.html.php b/module/task/ui/restart.html.php
index b0bd841069..7ba5f6d5d8 100644
--- a/module/task/ui/restart.html.php
+++ b/module/task/ui/restart.html.php
@@ -69,7 +69,7 @@ else
         set::title($lang->task->restartAction),
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
-        set::shadow(!isonlybody()),
+        set::shadow(!isAjaxRequest('modal')),
         set::actions(array('submit')),
         set::submitBtnText($lang->task->restart),
         to::headingActions
diff --git a/module/task/ui/start.html.php b/module/task/ui/start.html.php
index c24760f945..2ddbca1872 100644
--- a/module/task/ui/start.html.php
+++ b/module/task/ui/start.html.php
@@ -72,7 +72,7 @@ else
         set::title($lang->task->startAction),
         set::headingClass('status-heading'),
         set::titleClass('form-label .form-grid'),
-        set::shadow(!isonlybody()),
+        set::shadow(!isAjaxRequest('modal')),
         set::actions(array('submit')),
         set::submitBtnText($lang->task->start),
         to::headingActions