From 8979bad28306ef40db2a9a6210d3b9764b61eeec Mon Sep 17 00:00:00 2001 From: devansh bawari Date: Thu, 11 Feb 2021 14:40:34 +0530 Subject: [PATCH] Fixed -> When you filter admin locale (add new locale and filter from top right corner) and go to product grid https://prnt.sc/z239b3 --- .../Resources/views/datagrid/table.blade.php | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php index a9732fc37..ebe667fd6 100644 --- a/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php +++ b/packages/Webkul/Ui/src/Resources/views/datagrid/table.blade.php @@ -1,12 +1,21 @@ @php + /* all locales */ + $locales = core()->getAllLocales(); + + /* request and fallback handling */ $locale = request()->get('locale') ?: app()->getLocale(); $channel = request()->get('channel') ?: (core()->getCurrentChannelCode() ?: core()->getDefaultChannelCode()); $customer_group = request()->get('customer_group'); - if ($channel == 'all') { - $locales = core()->getAllLocales(); - } else { - $locales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + /* handling cases for new locale if not present in current channel */ + if ($channel !== 'all') { + $channelLocales = app('Webkul\Core\Repositories\ChannelRepository')->findOneByField('code', $channel)->locales; + + if ($channelLocales->contains('code', $locale)) { + $locales = $channelLocales; + } else { + $channel = 'all'; + } } @endphp