Dev: options field coherence between manifest and db

LimeSurvey · Jul 17, 2017 · d64fa2f · d64fa2f
1 parent 9b93a3a
commit d64fa2f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/application/core/LSETwigViewRenderer.php b/application/core/LSETwigViewRenderer.php
@@ -210,10 +210,8 @@ public function renderTemplateFromString( $line, $aDatas, $oTemplate, $bReturn=f
         }
 
         // Add the template options
-        foreach($oRTemplate->oOptions as $oOption){
-            foreach($oOption as $key => $value){
-                $aDatas["aSurveyInfo"]["options"][$key] = (string) $value;
-            }
+        foreach($oTemplate->oOptions as $key => $value){
+            $aDatas["aSurveyInfo"]["options"][$key] = (string) $value;
         }
 
 
@@ -242,7 +240,7 @@ public function renderTemplateFromString( $line, $aDatas, $oTemplate, $bReturn=f
         $nvLine        = $oTwigTemplate->render($aDatas, false);
 
 
-        if (!$bReturn){    
+        if (!$bReturn){
             Yii::app()->clientScript->registerPackage( $oTemplate->sPackageName );
             ob_start(function($buffer, $phase)
             {

diff --git a/application/models/TemplateConfig.php b/application/models/TemplateConfig.php
@@ -51,7 +51,7 @@ class TemplateConfig extends CActiveRecord
     /** @var TemplateConfiguration $oMotherTemplate The template name */
     public $oMotherTemplate;
 
-    /** @var SimpleXMLElement $oOptions The template options */
+    /** @var array $oOptions The template options */
     public $oOptions;
 
 

diff --git a/application/models/TemplateConfiguration.php b/application/models/TemplateConfiguration.php
@@ -172,6 +172,10 @@ public static function importManifest($sTemplateName)
         if ($oNewTemplate->save()){
             $oNewTemplateConfiguration                    = new TemplateConfiguration;
             $oNewTemplateConfiguration->templates_name    = $oEditedTemplate->sTemplateName;
+            $oNewTemplateConfiguration->templates_name    = $oEditedTemplate->sTemplateName;
+            $oNewTemplateConfiguration->options           = json_encode($oEditedTemplate->oOptions);
+
+
             if ($oNewTemplateConfiguration->save()){
                 return true;
             }else{
@@ -320,9 +324,12 @@ protected function setThisTemplate()
         // TODO: twig getOption should return mother template option when option = inherit
         $this->oOptions = array();
         if (!empty($this->options)){
-            $this->oOptions[] = (array) json_decode($this->options);
+            $this->oOptions = json_decode($this->options);
         }elseif(!empty($this->oMotherTemplate->oOptions)){
-            $this->oOptions[] = $this->oMotherTemplate->oOptions;
+            // NB: This case should never happen with core template edited via template editor
+            // Options are inherited from global settings to survey settings, not from mother template.
+            // But: a 3rd template provider could use that logic
+            $this->oOptions = $this->oMotherTemplate->oOptions;
         }
 
         // Not mandatory (use package dependances)
@@ -367,7 +374,7 @@ protected function getFrameworkAssetsToReplace( $sType, $bInlcudeRemove = false)
         $aAssetsToRemove = array();
         if (!empty( $aFieldValue )){
             $aAssetsToRemove = (array) $aFieldValue['replace'] ;
-            if($bInlcudeRemove){
+            if($bInlcudeRemove && isset($aFieldValue['remove'])){
                 $aAssetsToRemove = array_merge($aAssetsToRemove, (array) $aFieldValue['remove'] );
             }
         }

diff --git a/application/models/TemplateManifest.php b/application/models/TemplateManifest.php
@@ -500,7 +500,8 @@ protected function setThisTemplate()
 
         // Options are optional
         if (!empty($this->config->xpath("//options"))){
-            $this->oOptions = $this->config->xpath("//options");
+            $aOptions = $this->config->xpath("//options");
+            $this->oOptions = $aOptions[0];
         }elseif(!empty($this->oMotherTemplate->oOptions)){
             $this->oOptions = $this->oMotherTemplate->oOptions;
         }else{