Improve get relative model title for select2 widget

ereminmdev · Jul 6, 2021 · 547b786 · 547b786
1 parent 647c6e2
commit 547b786
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/components/Crud.php b/components/Crud.php
@@ -556,7 +556,7 @@ public function guessColumns($fields = null)
                             $filter = null;
                             if (array_key_exists('select2', $schema)) {
                                 $schema['select2'] = is_array($schema['select2']) ? $schema['select2'] : [];
-                                $title = isset($schema['relativeTitle']) ? $model->$relation->{$schema['relativeTitle']} : $model->$field;
+                                $title = isset($schema['relativeTitle']) ? $model->$relation->{$schema['relativeTitle']} : ($model->hasAttribute('title') ? $model->getAttribute('title') : $model->$field);
                                 $filter = \conquer\select2\Select2Widget::widget(ArrayHelper::merge(
                                     $this->getSelect2Options($model, $field, $title),
                                     $schema['select2'],
@@ -814,7 +814,7 @@ public function renderFormField(ActiveForm $form, ActiveRecord $model, $field, $
                         }
                         if (array_key_exists('select2', $schema)) {
                             $schema['select2'] = is_array($schema['select2']) ? $schema['select2'] : [];
-                            $title = isset($schema['relativeTitle']) ? $model->$relation->{$schema['relativeTitle']} : $model->$field;
+                            $title = isset($schema['relativeTitle']) ? $model->$relation->{$schema['relativeTitle']} : ($model->hasAttribute('title') ? $model->getAttribute('title') : $model->$field);
                             $formField = $form->field($model, $field)->widget(
                                 \conquer\select2\Select2Widget::class,
                                 ArrayHelper::merge($this->getSelect2Options($model, $field, $title), $schema['select2'])