mirror of
https://github.com/SuiteCRM/SuiteCRM-Core.git
synced 2025-08-29 21:00:39 +08:00
Fix message handling on InstallActionHandler
This commit is contained in:
parent
627d886600
commit
a2c7628722
1 changed files with 9 additions and 3 deletions
|
@ -133,7 +133,7 @@ class InstallActionHandler implements ProcessHandlerInterface
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!empty($missingOptions)){
|
if (!empty($missingOptions)) {
|
||||||
$process->setStatus('error');
|
$process->setStatus('error');
|
||||||
$process->setMessages(['Missing required options: ' . implode(', ', $missingOptions)]);
|
$process->setMessages(['Missing required options: ' . implode(', ', $missingOptions)]);
|
||||||
$process->setData([]);
|
$process->setData([]);
|
||||||
|
@ -232,11 +232,17 @@ class InstallActionHandler implements ProcessHandlerInterface
|
||||||
return ['LBL_SILENT_INSTALL_SUCCESS'];
|
return ['LBL_SILENT_INSTALL_SUCCESS'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$messages = [];
|
||||||
|
|
||||||
if (!empty($result->getMessageLabels())) {
|
if (!empty($result->getMessageLabels())) {
|
||||||
return [$result->getMessageLabels()[0]];
|
$messages = $result->getMessageLabels();
|
||||||
}
|
}
|
||||||
|
|
||||||
return $result->getMessageLabels();
|
if (!empty($result->getMessages())) {
|
||||||
|
$messages = array_merge($messages, $result->getMessages());
|
||||||
|
}
|
||||||
|
|
||||||
|
return $messages;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue