first commit
This commit is contained in:
@@ -114,10 +114,10 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
*/
|
||||
protected function canQueueSelectedSite()
|
||||
{
|
||||
if ($this->selectedSite === null || empty($this->solrConnectionManager->getConnectionsBySite($this->selectedSite))) {
|
||||
if ($this->selectedSite === null || empty($this->meilisearchConnectionManager->getConnectionsBySite($this->selectedSite))) {
|
||||
return false;
|
||||
}
|
||||
$enabledIndexQueueConfigurationNames = $this->selectedSite->getSolrConfiguration()->getEnabledIndexQueueConfigurationNames();
|
||||
$enabledIndexQueueConfigurationNames = $this->selectedSite->getMeilisearchConfiguration()->getEnabledIndexQueueConfigurationNames();
|
||||
if (empty($enabledIndexQueueConfigurationNames)) {
|
||||
return false;
|
||||
}
|
||||
@@ -153,11 +153,11 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
// initialize selected indexing configuration
|
||||
$initializedIndexingConfigurations = $this->indexQueue->getInitializationService()->initializeBySiteAndIndexConfigurations($this->selectedSite, $indexingConfigurationsToInitialize);
|
||||
} else {
|
||||
$messageLabel = 'solr.backend.index_queue_module.flashmessage.initialize.no_selection';
|
||||
$titleLabel = 'solr.backend.index_queue_module.flashmessage.not_initialized.title';
|
||||
$messageLabel = 'meilisearch.backend.index_queue_module.flashmessage.initialize.no_selection';
|
||||
$titleLabel = 'meilisearch.backend.index_queue_module.flashmessage.not_initialized.title';
|
||||
$this->addFlashMessage(
|
||||
LocalizationUtility::translate($messageLabel, 'Solr'),
|
||||
LocalizationUtility::translate($titleLabel, 'Solr'),
|
||||
LocalizationUtility::translate($messageLabel, 'Meilisearch'),
|
||||
LocalizationUtility::translate($titleLabel, 'Meilisearch'),
|
||||
FlashMessage::WARNING
|
||||
);
|
||||
}
|
||||
@@ -168,11 +168,11 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
}
|
||||
|
||||
if (!empty($initializedIndexingConfigurations)) {
|
||||
$messageLabel = 'solr.backend.index_queue_module.flashmessage.initialize.success';
|
||||
$titleLabel = 'solr.backend.index_queue_module.flashmessage.initialize.title';
|
||||
$messageLabel = 'meilisearch.backend.index_queue_module.flashmessage.initialize.success';
|
||||
$titleLabel = 'meilisearch.backend.index_queue_module.flashmessage.initialize.title';
|
||||
$this->addFlashMessage(
|
||||
LocalizationUtility::translate($messageLabel, 'Solr', [implode(', ', $messagesForConfigurations)]),
|
||||
LocalizationUtility::translate($titleLabel, 'Solr'),
|
||||
LocalizationUtility::translate($messageLabel, 'Meilisearch', [implode(', ', $messagesForConfigurations)]),
|
||||
LocalizationUtility::translate($titleLabel, 'Meilisearch'),
|
||||
FlashMessage::OK
|
||||
);
|
||||
}
|
||||
@@ -189,10 +189,10 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
{
|
||||
$resetResult = $this->indexQueue->resetAllErrors();
|
||||
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.success.reset_errors';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.success.reset_errors';
|
||||
$severity = FlashMessage::OK;
|
||||
if (!$resetResult) {
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.error.reset_errors';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.error.reset_errors';
|
||||
$severity = FlashMessage::ERROR;
|
||||
}
|
||||
|
||||
@@ -211,12 +211,12 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
*/
|
||||
public function requeueDocumentAction(string $type, int $uid)
|
||||
{
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.error.single_item_not_requeued';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.error.single_item_not_requeued';
|
||||
$severity = FlashMessage::ERROR;
|
||||
|
||||
$updateCount = $this->indexQueue->updateItem($type, $uid, time());
|
||||
if ($updateCount > 0) {
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.success.single_item_was_requeued';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.success.single_item_was_requeued';
|
||||
$severity = FlashMessage::OK;
|
||||
}
|
||||
|
||||
@@ -235,7 +235,7 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
{
|
||||
if (is_null($indexQueueItemId)) {
|
||||
// add a flash message and quit
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.error.no_queue_item_for_queue_error';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.error.no_queue_item_for_queue_error';
|
||||
$severity = FlashMessage::ERROR;
|
||||
$this->addIndexQueueFlashMessage($label, $severity);
|
||||
|
||||
@@ -258,16 +258,16 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
$indexService = GeneralUtility::makeInstance(IndexService::class, /** @scrutinizer ignore-type */ $this->selectedSite);
|
||||
$indexWithoutErrors = $indexService->indexItems(10);
|
||||
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.success.index_manual';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.success.index_manual';
|
||||
$severity = FlashMessage::OK;
|
||||
if (!$indexWithoutErrors) {
|
||||
$label = 'solr.backend.index_queue_module.flashmessage.error.index_manual';
|
||||
$label = 'meilisearch.backend.index_queue_module.flashmessage.error.index_manual';
|
||||
$severity = FlashMessage::ERROR;
|
||||
}
|
||||
|
||||
$this->addFlashMessage(
|
||||
LocalizationUtility::translate($label, 'Solr'),
|
||||
LocalizationUtility::translate('solr.backend.index_queue_module.flashmessage.index_manual', 'Solr'),
|
||||
LocalizationUtility::translate($label, 'Meilisearch'),
|
||||
LocalizationUtility::translate('meilisearch.backend.index_queue_module.flashmessage.index_manual', 'Meilisearch'),
|
||||
$severity
|
||||
);
|
||||
|
||||
@@ -282,6 +282,6 @@ class IndexQueueModuleController extends AbstractModuleController
|
||||
*/
|
||||
protected function addIndexQueueFlashMessage($label, $severity)
|
||||
{
|
||||
$this->addFlashMessage(LocalizationUtility::translate($label, 'Solr'), LocalizationUtility::translate('solr.backend.index_queue_module.flashmessage.title', 'Solr'), $severity);
|
||||
$this->addFlashMessage(LocalizationUtility::translate($label, 'Meilisearch'), LocalizationUtility::translate('meilisearch.backend.index_queue_module.flashmessage.title', 'Meilisearch'), $severity);
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user