PlaceHolder added

CostaRico · Aug 9, 2014 · 12e082a · 12e082a
1 parent 61ac881
commit 12e082a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 5 deletions.
diff --git a/Module.php b/Module.php
@@ -49,7 +49,7 @@ public function getImage($item, $dirtyAlias)
                      ])*/
             ->one();
         if(!$image){
-            $image = new PlaceHolder();
+            return $this->getPlaceHolder();
         }
 
         return $image;
@@ -168,4 +168,13 @@ public function init()
             throw new \Exception('Setup imagesStorePath and imagesCachePath images module properties!!!');
         // custom initialization code goes here
     }
+
+    public function getPlaceHolder(){
+
+        if($this->placeHolderPath){
+            return new PlaceHolder();
+        }else{
+            return null;
+        }
+    }
 }
diff --git a/behaviors/ImageBehave.php b/behaviors/ImageBehave.php
@@ -172,7 +172,7 @@ public function getImages()
 
         $imageRecords = $imageQuery->all();
         if(!$imageRecords){
-            return [new models\PlaceHolder()];
+            return $this->getModule()->getPlaceHolder();
         }
         return $imageRecords;
     }
@@ -191,7 +191,7 @@ public function getImage()
 
         $img = $imageQuery->one();
         if(!$img){
-            return new models\PlaceHolder();
+            return $this->getModule()->getPlaceHolder();
         }
 
         return $img;
@@ -282,6 +282,8 @@ private function getAlias()
     }
 
 
+
+
 }
 
 
diff --git a/models/Image.php b/models/Image.php
@@ -132,8 +132,8 @@ public function createVersion($imagePath, $sizeString = false)
         }else{
             $sizePart = '';
         }
-        $pathToSave = $cachePath.'/'.$subDirPath.'/'.$this->urlAlias.$sizePart.'.'.$fileExtension;
 
+        $pathToSave = $cachePath.'/'.$subDirPath.'/'.$this->urlAlias.$sizePart.'.'.$fileExtension;
 
         BaseFileHelper::createDirectory(dirname($pathToSave), 0777, true);
 
@@ -196,7 +196,7 @@ public function setMain($isMain = true){
 
     }
 
-    private function getSubDur(){
+    protected function getSubDur(){
         return $this->modelName. 's/' . $this->modelName.$this->itemId;
     }
 

diff --git a/models/PlaceHolder.php b/models/PlaceHolder.php
@@ -44,6 +44,12 @@ public function getPathToOrigin()
         return $url;
     }
 
+    protected  function getSubDur(){
+        return 'placeHolder';
+    }
+    public function setMain($isMain = true){
+        throw new yii\base\Exception('You must not set placeHolder as main image!!!');
+    }
 
 }