fix relation

summerblue · Oct 26, 2017 · 8a4fea2 · 8a4fea2
1 parent 4a14663
commit 8a4fea2
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/Frozennode/Administrator/Fields/Relationships/BelongsToMany.php b/src/Frozennode/Administrator/Fields/Relationships/BelongsToMany.php
@@ -32,8 +32,8 @@ public function build()
         $relatedModel = $relationship->getRelated();
 
         $options['table']       = $relationship->getTable();
-        $options['column']      = $relationship->getForeignKey();
-        $options['column2']     = $relationship->getOtherKey();
+        $options['column']      = $relationship->getQualifiedForeignPivotKeyName();
+        $options['column2']     = $relationship->getQualifiedRelatedPivotKeyName();
         $options['foreign_key'] = $relatedModel->getKeyName();
 
         $this->suppliedOptions = $options;

diff --git a/src/Frozennode/Administrator/Fields/Relationships/HasOneOrMany.php b/src/Frozennode/Administrator/Fields/Relationships/HasOneOrMany.php
@@ -30,7 +30,7 @@ public function build()
         $related_model = $relationship->getRelated();
 
         $options['table']  = $related_model->getTable();
-        $options['column'] = $relationship->getPlainForeignKey();
+        $options['column'] = $relationship->getQualifiedForeignKeyName();
 
         $this->suppliedOptions = $options;
     }