Merge pull request #7 from ufocoder/fix-related-placeholder

Fix related placeholder
mohorev · May 23, 2015 · db29d9e · db29d9e
2 parents ff6c219 + 882de74
commit db29d9e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -45,6 +45,14 @@ class Document extends ActiveRecord
         ];
     }
 
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getCategory()
+    {
+        return $this->hasOne(Category::className(), [ 'id' => 'id_category' ]);
+    }
+
     /**
      * @inheritdoc
      */
@@ -55,8 +63,8 @@ class Document extends ActiveRecord
                 'class' => UploadBehavior::className(),
                 'attribute' => 'file',
                 'scenarios' => ['insert', 'update'],
-                'path' => '@webroot/upload/docs',
-                'url' => '@web/upload/docs',
+                'path' => '@webroot/upload/docs/{category.id}/',
+                'url' => '@web/upload/docs/{category.id}/',
             ],
         ];
     }

diff --git a/UploadBehavior.php b/UploadBehavior.php
@@ -236,7 +236,7 @@ protected function resolvePath($path)
         $model = $this->owner;
         return preg_replace_callback('/{([^}]+)}/', function ($matches) use ($model) {
             $name = $matches[1];
-            $attribute = $model->getAttribute($name);
+            $attribute = ArrayHelper::getValue($model, $name);
             if (is_string($attribute) || is_numeric($attribute)) {
                 return $attribute;
             } else {