From bfd227b500bd155a143e6ffbbdfa328bd76ebadf Mon Sep 17 00:00:00 2001 From: sunhao Date: Sun, 28 Sep 2025 16:41:13 +0800 Subject: [PATCH] * [story #77917] enhance promptExecute function by adding auto parameter for conditional form opening. Update prompt menu links to include auto parameter and modify response structure for improved callback handling. Add 'goTesting' language entry in multiple language files. --- module/ai/control.php | 10 ++++++---- module/ai/ui/promptmenu.html.php | 4 ++-- module/aiapp/lang/de.php | 1 + module/aiapp/lang/en.php | 1 + module/aiapp/lang/fr.php | 1 + module/aiapp/lang/zh-cn.php | 1 + 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/module/ai/control.php b/module/ai/control.php index 65b9caeeda..9b128e8a92 100644 --- a/module/ai/control.php +++ b/module/ai/control.php @@ -751,10 +751,11 @@ class ai extends control * * @param int $promptId * @param int $objectId + * @param bool $auto Auto open target form and apply changes. * @access public * @return void */ - public function promptExecute($promptId, $objectId) + public function promptExecute($promptId, $objectId, $auto = true) { $prompt = $this->ai->getPromptByID($promptId); if(empty($prompt) || !$this->ai->isExecutable($prompt)) return $this->send(array('result' => 'fail', 'message' => sprintf($this->lang->ai->execute->failFormat, $this->lang->ai->execute->failReasons['noPrompt']))); @@ -800,8 +801,9 @@ class ai extends control $response['object'] = $objectData; $response['formLocation'] = $location; $response['promptConfig'] = $prompt; + $response['promptAudit'] = $this->ai->isClickable($prompt, 'promptaudit'); - return $this->send(array('result' => 'success', 'data' => $response, 'callback' => array('name' => 'parent.executeZentaoPrompt', 'params' => array($response)))); + return $this->send(array('result' => 'success', 'callback' => array('name' => 'parent.executeZentaoPrompt', 'params' => array($response, $auto)))); } /** @@ -837,7 +839,7 @@ class ai extends control if(!empty($exit)) { unset($_SESSION['auditPrompt']); - return $this->send(array('result' => 'success', 'locate' => $this->inlink('promptview', "promptID=$promptId"))); + return $this->send(array('result' => 'success', 'load' => $this->inlink('promptview', "promptID=$promptId"))); } $prompt = $this->ai->getPromptByID($promptId); @@ -863,7 +865,7 @@ class ai extends control } else { - $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'callback' => "reloadPrompt($promptId, $objectId)"); + $response = array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $this->createLink('ai', 'promptexecute', "promptId=$promptId&objectId=$objectId")); } $this->sendSuccess($response); diff --git a/module/ai/ui/promptmenu.html.php b/module/ai/ui/promptmenu.html.php index 9131adc2bf..5fa49a7358 100644 --- a/module/ai/ui/promptmenu.html.php +++ b/module/ai/ui/promptmenu.html.php @@ -49,7 +49,7 @@ $promptMenuInject = function() $html .= '
  • '; $html .= html::a ( - helper::createLink('ai', 'promptExecute', "promptId=$prompt->id&objectId=$currentObjectId"), + helper::createLink('ai', 'promptExecute', "promptId=$prompt->id&objectId=$currentObjectId&auto=0"), $prompt->name . ($prompt->status != 'active' ? '' . $this->lang->ai->prompts->statuses[$prompt->status] . '' : ''), '', "class='prompt ajax-submit' style='width: 100%;'" . (empty($prompt->unauthorized) ? '' : ' disabled') . (empty($prompt->desc) ? '' : " data-toggle='popover' data-container='body' data-trigger='hover' data-content='$prompt->desc' data-title='$prompt->name' data-placement='left'"), @@ -65,7 +65,7 @@ $promptMenuInject = function() $btnClass = 'prompt btn ghost size-sm font-medium ajax-submit' . ((isset($menuOptions->class) ? ' ' . $menuOptions->class : '') . (isset($menuOptions->buttonClass) ? ' ' . $menuOptions->buttonClass : '')); $html .= html::a ( - helper::createLink('ai', 'promptExecute', "promptId=$prompt->id&objectId=$currentObjectId"), + helper::createLink('ai', 'promptExecute', "promptId=$prompt->id&objectId=$currentObjectId&auto=0"), $prompt->name . ($prompt->status != 'active' ? '' . $this->lang->ai->prompts->statuses[$prompt->status] . '' : ''), '', "class='$btnClass' " . (empty($prompt->unauthorized) ? '' : ' disabled') . (empty($prompt->desc) ? '' : " data-toggle='popover' data-container='body' data-trigger='hover' data-content='$prompt->desc' data-title='$prompt->name' data-placement='bottom'") diff --git a/module/aiapp/lang/de.php b/module/aiapp/lang/de.php index bb1decbda1..f347533025 100644 --- a/module/aiapp/lang/de.php +++ b/module/aiapp/lang/de.php @@ -73,3 +73,4 @@ $lang->aiapp->langData->changeProp = 'Eigenschaft'; $lang->aiapp->langData->changeTitleFormat = 'Änderung {type} #{id}'; $lang->aiapp->langData->applyFormSuccess = 'Erfolgreich auf %s-Formular angewendet'; $lang->aiapp->langData->changeExplainDesc = 'Erklären Sie die Änderungen an den Daten, versuchen Sie, jede geänderte Eigenschaft zu erklären.'; +$lang->aiapp->langData->goTesting = 'Zur Prüfung'; diff --git a/module/aiapp/lang/en.php b/module/aiapp/lang/en.php index 079de5082c..7026698cd2 100644 --- a/module/aiapp/lang/en.php +++ b/module/aiapp/lang/en.php @@ -73,3 +73,4 @@ $lang->aiapp->langData->changeProp = 'Property'; $lang->aiapp->langData->changeTitleFormat = 'Change {type} #{id}'; $lang->aiapp->langData->applyFormSuccess = 'Successfully applied to %s form'; $lang->aiapp->langData->changeExplainDesc = 'Explain the changes to the data, try to explain each changed attribute.'; +$lang->aiapp->langData->goTesting = 'Go Testing'; diff --git a/module/aiapp/lang/fr.php b/module/aiapp/lang/fr.php index f242d75c4f..6b0ff6b3a2 100644 --- a/module/aiapp/lang/fr.php +++ b/module/aiapp/lang/fr.php @@ -73,3 +73,4 @@ $lang->aiapp->langData->changeProp = 'Propriété'; $lang->aiapp->langData->changeTitleFormat = 'Changement {type} #{id}'; $lang->aiapp->langData->applyFormSuccess = 'Successfully applied to %s form'; $lang->aiapp->langData->changeExplainDesc = 'Expliquez les changements apportés aux données, essayez d\'expliquer chaque attribut modifié.'; +$lang->aiapp->langData->goTesting = 'Aller au test'; diff --git a/module/aiapp/lang/zh-cn.php b/module/aiapp/lang/zh-cn.php index 28177ea81d..245ea762d9 100644 --- a/module/aiapp/lang/zh-cn.php +++ b/module/aiapp/lang/zh-cn.php @@ -73,3 +73,4 @@ $lang->aiapp->langData->changeProp = '属性'; $lang->aiapp->langData->changeTitleFormat = '变更{type} #{id}'; $lang->aiapp->langData->applyFormSuccess = '已成功应用到%s表单'; $lang->aiapp->langData->changeExplainDesc = '对数据的变化进行解释，尽量对变化的属性分别进行说明。'; +$lang->aiapp->langData->goTesting = '去调试';