Removed setInvoker method and allowed property to get set in Datagrid's constructor.

This commit is contained in:
Prashant Singh 2019-09-11 12:59:51 +05:30
parent fe335a0e70
commit d48fe8d435
25 changed files with 5 additions and 53 deletions

View File

@ -28,8 +28,6 @@ class AttributeDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class AttributeFamilyDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.id'), 'label' => trans('admin::app.id'),

View File

@ -30,8 +30,6 @@ class CMSPageDataGrid extends DataGrid
$locales = app('Webkul\Core\Repositories\LocaleRepository'); $locales = app('Webkul\Core\Repositories\LocaleRepository');
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -28,8 +28,6 @@ class CartRuleDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.id'), 'label' => trans('admin::app.id'),

View File

@ -28,8 +28,6 @@ class CatalogRuleDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -37,8 +37,6 @@ class CategoryDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'category_id', 'index' => 'category_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class ChannelDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class CurrencyDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -34,8 +34,6 @@ class CustomerDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'customer_id', 'index' => 'customer_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class CustomerGroupDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => 'ID', 'label' => 'ID',

View File

@ -34,8 +34,6 @@ class CustomerReviewDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'product_review_id', 'index' => 'product_review_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -28,8 +28,6 @@ class ExchangeRatesDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'currency_exch_id', 'index' => 'currency_exch_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class InventorySourcesDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class LocalesDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class NewsLetterDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -42,8 +42,6 @@ class OrderDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class OrderInvoicesDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -42,8 +42,6 @@ class OrderShipmentsDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'shipment_id', 'index' => 'shipment_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -42,8 +42,6 @@ class ProductDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'product_id', 'index' => 'product_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class RolesDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -30,8 +30,6 @@ class SliderDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'slider_id', 'index' => 'slider_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class TaxCategoryDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -26,8 +26,6 @@ class TaxRateDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'id', 'index' => 'id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -30,8 +30,6 @@ class UserDataGrid extends DataGrid
public function addColumns() public function addColumns()
{ {
$this->setInvoker($this);
$this->addColumn([ $this->addColumn([
'index' => 'user_id', 'index' => 'user_id',
'label' => trans('admin::app.datagrid.id'), 'label' => trans('admin::app.datagrid.id'),

View File

@ -139,6 +139,11 @@ abstract class DataGrid
abstract public function prepareQueryBuilder(); abstract public function prepareQueryBuilder();
abstract public function addColumns(); abstract public function addColumns();
public function __construct()
{
$this->invoker = $this;
}
/** /**
* Parse the URL and get it ready to be used. * Parse the URL and get it ready to be used.
*/ */
@ -420,11 +425,6 @@ abstract class DataGrid
public function prepareActions() { public function prepareActions() {
} }
public function setInvoker($object)
{
$this->invoker = $object;
}
public function render() public function render()
{ {
$this->addColumns(); $this->addColumns();