From 7fd99431dfb73479a65c01d3656458d145554c28 Mon Sep 17 00:00:00 2001 From: Hannes Papenberg Date: Fri, 16 Aug 2024 14:17:42 +0200 Subject: [PATCH] Partial revert of #43230 --- .../components/com_installer/src/Model/UpdatesitesModel.php | 2 +- .../components/com_languages/src/Model/OverridesModel.php | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/administrator/components/com_installer/src/Model/UpdatesitesModel.php b/administrator/components/com_installer/src/Model/UpdatesitesModel.php index 66a54a74bcce0..1c4c90967d46c 100644 --- a/administrator/components/com_installer/src/Model/UpdatesitesModel.php +++ b/administrator/components/com_installer/src/Model/UpdatesitesModel.php @@ -554,7 +554,7 @@ protected function getListQuery() // Process select filters. $supported = $this->getState('filter.supported'); - $enabled = $this->getState('filter.enabled'); + $enabled = $this->getState('filter.enabled', ''); $type = $this->getState('filter.type'); $clientId = $this->getState('filter.client_id'); $folder = $this->getState('filter.folder'); diff --git a/administrator/components/com_languages/src/Model/OverridesModel.php b/administrator/components/com_languages/src/Model/OverridesModel.php index e005904841104..63092bcc64358 100644 --- a/administrator/components/com_languages/src/Model/OverridesModel.php +++ b/administrator/components/com_languages/src/Model/OverridesModel.php @@ -165,7 +165,13 @@ protected function populateState($ordering = 'key', $direction = 'asc') $client = substr($language_client, -1); $language = substr($language_client, 0, -1); + // Sets the search filter. + $search = $this->getUserStateFromRequest($this->context . '.filter.search', 'filter_search'); + $this->setState('filter.search', $search); + $this->setState('language_client', $language . $client); + $this->setState('filter.client', $client ? 'administrator' : 'site'); + $this->setState('filter.language', $language); // Add the 'language_client' value to the session to display a message if none selected $app->setUserState('com_languages.overrides.language_client', $language . $client);