* Change the logic of the judgement pop-window.

This commit is contained in:
tianshujie
2023-06-21 09:27:06 +08:00
parent 9db3041c6e
commit e8d19aa976
10 changed files with 10 additions and 12 deletions
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -3
View File
@@ -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();
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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
+1 -1
View File
@@ -68,7 +68,7 @@ if($efforts)
formBatchPanel
(
set::title($lang->task->addEffort),
set::shadow(!isonlybody()),
set::shadow(!isAjaxRequest('modal')),
set::actions(array('submit')),
formBatchItem
(
+1 -1
View File
@@ -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
+1 -1
View File
@@ -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