* Adjust action set for instance.

This commit is contained in:
caoyanyi
2023-12-21 11:23:08 +08:00
parent 1ae356e418
commit 84c6bbf864
+14 -10
View File
@@ -998,21 +998,25 @@ class actionModel extends model
$action->newMemory = $action->comment;
$action->comment = '';
}
if(!empty($extra))
{
$action->oldName = zget($extra->data, 'oldName', '');
$action->newName = zget($extra->data, 'newName', '');
$action->oldVersion = zget($extra->data, 'oldVersion', '');
$action->newVersion = zget($extra->data, 'newVersion', '');
$action->oldAppName = zget($extra->data, 'oldAppName', '');
$action->newAppName = zget($extra->data, 'newAppName', '');
$enableAutoBackup = zget($extra->data, 'autoBackup', 0);
if($actionType == 'saveautobackupsettings' && $enableAutoBackup) $desc = $this->lang->action->desc->closeautobackupsettings;
$action->extra = '';
if(!empty($extra->data))
{
$action->oldName = zget($extra->data, 'oldName', '');
$action->newName = zget($extra->data, 'newName', '');
$action->oldVersion = zget($extra->data, 'oldVersion', '');
$action->newVersion = zget($extra->data, 'newVersion', '');
$action->oldAppName = zget($extra->data, 'oldAppName', '');
$action->newAppName = zget($extra->data, 'newAppName', '');
$enableAutoBackup = zget($extra->data, 'autoBackup', 0);
if($actionType == 'saveautobackupsettings' && $enableAutoBackup) $desc = $this->lang->action->desc->closeautobackupsettings;
}
if(!empty($extra->result->code) && $extra->result->code != 200 && !empty($extra->result->message)) $action->comment = $extra->result->message;
if(is_string($extra->result) && $extra->result != 'fail')
if(is_string($extra->result) && $extra->result != 'fail' && isset($extra->message))
{
$action->comment = "\n" . $extra->message;
}