Fixes extracting key values for viaTable relationships

solutosoft · Jun 29, 2022 · 8e42588 · 8e42588
1 parent 84ef416
commit 8e42588
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 Yii LinkMany Change Log
 =======================
 
+1.1.0 under development
+-----------------------
+
+- Fixes extracting key values for `viaTable` relationships
+
 1.1.0 Jan 18, 2022
 ------------------
 

diff --git a/composer.json b/composer.json
@@ -48,5 +48,10 @@
     "branch-alias": {
       "dev-master": "1.0.x-dev"
     }
+  },
+  "config": {
+    "allow-plugins": {
+      "yiisoft/yii2-composer": true
+    }
   }
 }
diff --git a/src/LinkManyBehavior.php b/src/LinkManyBehavior.php
@@ -333,7 +333,16 @@ protected function fillRelation($model, $data, $formName)
     protected function extractPrimaryKey($data, $relation)
     {
         if ($relation->via) {
-            return $data;
+            if (is_scalar($data)) {
+                return $data;
+            }
+
+            $result = [];
+            foreach ($relation->via->link as $key => $value) {
+                $result[] = $data[$value];
+            }
+
+            return count($result) === 1 ?  $result[0] : $result;
         } else {
             $modelClass = $relation->modelClass;
             $primaryKey = $modelClass::primaryKey();