laravel 5.8

summerblue · May 7, 2019 · f82fa3d · f82fa3d
1 parent 03717ab
commit f82fa3d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/src/Frozennode/Administrator/AdministratorServiceProvider.php b/src/Frozennode/Administrator/AdministratorServiceProvider.php
@@ -45,7 +45,7 @@ public function boot()
         //set the locale
         $this->setLocale();
 
-        $this->app['events']->fire('administrator.ready');
+        $this->app['events']->dispatch('administrator.ready');
     }
 
     /**

diff --git a/src/Frozennode/Administrator/DataTable/Columns/Relationships/BelongsTo.php b/src/Frozennode/Administrator/DataTable/Columns/Relationships/BelongsTo.php
@@ -102,7 +102,7 @@ public function filterQuery(&$selects)
                 $last_alias         = $columnName.'_'.$this->tablePrefix.$model->getTable();
                 $joins .= ' LEFT JOIN '.$table.' AS '.$alias.
                             ' ON '.$alias.'.'.$relationship->getOtherKey().
-                                ' = '.$last_alias.'.'.$relationship->getForeignKey();
+                                ' = '.$last_alias.'.'.$relationship_model->getForeignKey();
             }
         }
 
@@ -113,7 +113,7 @@ public function filterQuery(&$selects)
         $from_table         = $this->tablePrefix.$relationship_model->getTable();
         $field_table        = $columnName.'_'.$from_table;
 
-        $where = $this->tablePrefix.$first_model->getTable().'.'.$first_relationship->getForeignKey().
+        $where = $this->tablePrefix.$first_model->getTable().'.'.$relationship_model->getForeignKey().
                     ' = '.
                     $field_table.'.'.$first_relationship->getOtherKey();
 
@@ -131,7 +131,7 @@ public function getIncludedColumn()
     {
         $model  = $this->config->getDataModel();
         $nested = $this->getOption('nested');
-        $fk     = $nested['models'][0]->{$nested['pieces'][0]}()->getForeignKey();
+        $fk     = $nested['models'][0]->{$nested['pieces'][0]}()->getRelated()->getForeignKey();
 
         return array($fk => $model->getTable().'.'.$fk);
     }

diff --git a/src/Frozennode/Administrator/DataTable/Columns/Relationships/BelongsToMany.php b/src/Frozennode/Administrator/DataTable/Columns/Relationships/BelongsToMany.php
@@ -25,6 +25,8 @@ public function filterQuery(&$selects)
         $columnName = $this->getOption('column_name');
 
         $relationship = $model->{$this->getOption('relationship')}();
+        $relatedModel = $relationship->getRelated();
+
         $from_table   = $this->tablePrefix.$model->getTable();
         $field_table  = $columnName.'_'.$from_table;
         $other_table  = $this->tablePrefix.$relationship->getRelated()->getTable();
@@ -33,7 +35,7 @@ public function filterQuery(&$selects)
         $other_key    = $other_model->getKeyName();
         $int_table    = $this->tablePrefix.$relationship->getTable();
         $int_alias    = $columnName.'_'.$int_table;
-        $column1      = explode('.', $relationship->getForeignKey());
+        $column1      = explode('.', $relatedModel->getForeignKey());
         $column1      = $column1[1];
         $column2      = explode('.', $relationship->getOtherKey());
         $column2      = $column2[1];

diff --git a/src/Frozennode/Administrator/Fields/Relationships/BelongsTo.php b/src/Frozennode/Administrator/Fields/Relationships/BelongsTo.php
@@ -30,7 +30,7 @@ public function build()
 
         $options['table']       = $relatedModel->getTable();
         $options['column']      = $relatedModel->getKeyName();
-        $options['foreign_key'] = $relationship->getForeignKey();
+        $options['foreign_key'] = $relatedModel->getForeignKey();
 
         $this->suppliedOptions = $options;
     }