|
@@ -92,7 +92,7 @@ discard block |
|
|
block discarded – undo |
|
92
|
92
|
'visibleLabel' => \Yii::t('skeeks/cms', 'Display columns'), |
|
93
|
93
|
'hiddenLabel' => \Yii::t('skeeks/cms', 'Hidden columns'), |
|
94
|
94
|
], |
|
95
|
|
- 'on beforeRender' => function ($e) { |
|
|
95
|
+ 'on beforeRender' => function($e) { |
|
96
|
96
|
$widgetField = $e->sender; |
|
97
|
97
|
$widgetField->widgetConfig['items'] = ArrayHelper::getValue( |
|
98
|
98
|
\Yii::$app->controller->getCallableData(), |
|
@@ -127,9 +127,9 @@ discard block |
|
|
block discarded – undo |
|
127
|
127
|
//Автомтическое конфигурирование колонок |
|
128
|
128
|
$this->_initAutoFilters(); |
|
129
|
129
|
|
|
130
|
|
- $defaultFiltersModel = ArrayHelper::merge((array) $this->_autoDynamicModelData, $defaultFiltersModel); |
|
|
130
|
+ $defaultFiltersModel = ArrayHelper::merge((array)$this->_autoDynamicModelData, $defaultFiltersModel); |
|
131
|
131
|
|
|
132
|
|
- $this->filtersModel = ArrayHelper::merge($defaultFiltersModel, (array) $this->filtersModel); |
|
|
132
|
+ $this->filtersModel = ArrayHelper::merge($defaultFiltersModel, (array)$this->filtersModel); |
|
133
|
133
|
$this->filtersModel = \Yii::createObject($this->filtersModel); |
|
134
|
134
|
$this->filtersModel->load(\Yii::$app->request->get()); |
|
135
|
135
|
|
Please login to merge, or discard this patch.