From b87e6cdb2e56a1122a64db9a0d6bcad2262d535b Mon Sep 17 00:00:00 2001 From: Prashant Singh Date: Fri, 16 Aug 2019 18:48:13 +0530 Subject: [PATCH] Fixed channel locale issue in cms datagrid --- .../Webkul/Admin/src/DataGrids/CMSPageDataGrid.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php index 896f9331b..01bd7307c 100644 --- a/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php +++ b/packages/Webkul/Admin/src/DataGrids/CMSPageDataGrid.php @@ -64,24 +64,24 @@ class CMSPageDataGrid extends DataGrid 'searchable' => false, 'sortable' => true, 'filterable' => true, - 'wrapper' => function($row) use($channels) { - $channelCode = $channels->find($row->channel_id)->name; + 'wrapper' => function($row) use($locales) { + $localeCode = $locales->find($row->locale_id)->code; - return $row->channel_id.' ('. $channelCode. ')'; + return $row->locale_id.' ('. $localeCode. ')'; } ]); $this->addColumn([ 'index' => 'channel_id', - 'label' => trans('admin::app.cms.pages.channel'), + 'label' => trans('admin::app.cms.pages.locale'), 'type' => 'number', 'searchable' => false, 'sortable' => true, 'filterable' => true, - 'wrapper' => function($row) use($locales) { - $localeCode = $locales->find($row->locale_id)->code; + 'wrapper' => function($row) use($channels) { + $channelCode = $channels->find($row->channel_id)->name; - return $row->locale_id.' ('. $localeCode. ')'; + return $row->channel_id.' ('. $channelCode. ')'; } ]); }