Fixed issue: Manifest Templates have no preview alternative

LimeSurvey · Oct 30, 2017 · 2831843 · 2831843
1 parent 2da6aa0
commit 2831843
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -255,6 +255,23 @@ protected function getDependsPackages($oTemplate)
          return $packages;
      }
 
+     // For list, so no "setConfiguration" before
+     public function getPreview()
+     {
+         if (empty($this->sPreviewImgTag)){
+
+             $previewPath =  Template::getTemplatePath($this->template->name);
+
+             if (file_exists($previewPath.'/preview.png')){
+                 $previewUrl =  Template::getTemplateURL($this->template->name);
+                 $this->sPreviewImgTag = '<img src="'.$previewUrl.'/preview.png" alt="template preview" height="200"/>';
+             }else{
+                 $this->sPreviewImgTag = '<em>'.gT('No preview available').'</em>';
+             }
+
+         }
+         return $this->sPreviewImgTag;
+     }
 
 
      /**

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -303,23 +303,6 @@ public static function model($className=__CLASS__)
         return $model;
     }
 
-    // For list, so no "setConfiguration" before
-    public function getPreview()
-    {
-        if (empty($this->sPreviewImgTag)){
-
-            $previewPath =  Template::getTemplatePath($this->template->name);
-
-            if (file_exists($previewPath.'/preview.png')){
-                $previewUrl =  Template::getTemplateURL($this->template->name);
-                $this->sPreviewImgTag = '<img src="'.$previewUrl.'/preview.png" alt="template preview" height="200"/>';
-            }else{
-                $this->sPreviewImgTag = '<em>'.gT('No preview available').'</em>';
-            }
-
-        }
-        return $this->sPreviewImgTag;
-    }
 
     /**
      * Create a new entry in {{templates}} and {{template_configuration}} table using the template manifest

diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
@@ -210,15 +210,6 @@ public function getOtherFiles()
     }
 
 
-    public function getPreview()
-    {
-        if (empty($this->sPreviewImgTag)){
-            $previewUrl =  $this->getTemplateURL();// $this->getTemplateURL();//Template::getTemplateURL($this->template->name);
-            $this->sPreviewImgTag = '<img src="'.$previewUrl.'/preview.png" alt="template preview" height="200"/>';
-        }
-        return $this->sPreviewImgTag;
-    }
-
     /**
      *
      */
@@ -556,7 +547,7 @@ private function setTemplateName($sTemplateName='', $iSurveyId='')
             } else {
                 $this->sTemplateName = Template::templateNameFilter(App()->getConfig('defaulttemplate','default'));
             }
-        }        
+        }
     }