make it non breakable for 4.1

Author: pxpm

src/app/Library/CrudPanel/CrudColumn.php

@@ -32,7 +32,7 @@ class CrudColumn
 
     public function __construct($name)
     {
-        $column = $this->crud()->firstColumnWhere('key', str_replace('.', '__', $name));
+        $column = $this->crud()->firstColumnWhere('name', $name);
 
         // if column exists
         if ((bool) $column) {

src/app/Library/CrudPanel/CrudPanel.php

@@ -385,7 +385,7 @@ public function getRelatedEntriesAttributes($model, $relationString, $attribute)
                 //if attribute does not exist in main array we have more than one entry OR the attribute
                 //is an acessor that is not in $appends property of model.
                 if (! isset($entries[$attribute])) {
-                    //we first check if we don't have the attribute because it's and acessor that is not in appends.
+                    //we first check if we don't have the attribute because it's an acessor that is not in appends.
                     if ($model_instance->hasGetMutator($attribute) && isset($entries[$modelKey])) {
                         $entry_in_database = $model_instance->find($entries[$modelKey]);
                         $attributes[$entry_in_database->{$modelKey}] = $this->parseTranslatableAttributes($model_instance, $attribute, $entry_in_database->{$attribute});
@@ -458,7 +458,7 @@ public function parseTranslatableAttributes($model, $attribute, $value)
      */
     private function getRelatedEntries($model, $relationString)
     {
-        $relationArray = explode('.', $relationString);
+        $relationArray = explode('.', $this->getOnlyRelationEntity(['entity' => $relationString]));
         $firstRelationName = Arr::first($relationArray);
         $relation = $model->{$firstRelationName};
 

src/app/Library/CrudPanel/Traits/ColumnsProtectedMethods.php

@@ -150,9 +150,9 @@ protected function makeSureColumnHasEntity($column)
 
                 // if it has parameters it's not a relation method.
                 $column['entity'] = $this->modelMethodHasParameters($this->model, $possibleMethodName) ? false : $column['name'];
-            if (method_exists($model, $possibleMethodName)) {
-                $parts = explode('.', $column['name']);
-                $relation = $column['name'];
+            
+                $parts = explode('.', $column['entity']);
+
                 $attribute_in_relation = false;
 
                 // here we are going to iterate through all relation parts to check
@@ -161,15 +161,9 @@ protected function makeSureColumnHasEntity($column)
                     try {
                         $model = $model->$part()->getRelated();
                     } catch (\Exception $e) {
-                        $relation = join('.', array_slice($parts, 0, $i));
                         $attribute_in_relation = true;
                     }
                 }
-
-                if (! isset($column['type'])) {
-                    $column['name'] = $column['entity'] = $relation;
-                }
-
                 // if the user setup the attribute in relation string, we are not going to infer that attribute from model
                 // instead we get the defined attribute by the user.
                 if ($attribute_in_relation) {

tests/Unit/CrudPanel/CrudPanelColumnsTest.php

@@ -130,7 +130,7 @@ class CrudPanelColumnsTest extends BaseDBCrudPanelTest
             'relation_type' => 'HasOne',
         ],
         'accountDetails__nickname' => [
-            'name'        => 'accountDetails',
+            'name'        => 'accountDetails.nickname',
             'label'       => 'AccountDetails.nickname',
             'type'        => 'relationship',
             'key'         => 'accountDetails__nickname',
@@ -140,7 +140,7 @@ class CrudPanelColumnsTest extends BaseDBCrudPanelTest
             'orderable'   => false,
             'searchLogic' => false,
             'relation_type' => 'HasOne',
-            'entity' => 'accountDetails',
+            'entity' => 'accountDetails.nickname',
             'model' => 'Backpack\CRUD\Tests\Unit\Models\AccountDetails',
         ],
         'accountDetails__user' => [