Merge branch 'task/zoho-L41-T491-checkbox-layout-not_shown-in-overview'

LimeSurvey · Mar 16, 2021 · 708564a · 708564a
2 parents 3e70691 + b3e4d3b
commit 708564a
Showing 1 changed file with 18 additions and 11 deletions.
diff --git a/application/views/questionAdministration/summary.php b/application/views/questionAdministration/summary.php
@@ -204,27 +204,34 @@
         <?php endif; ?>
 
         <!-- Advanced Settings -->
-        <?php foreach ($advancedSettings as $settings): ?>
-            <?php foreach ($settings as $setting): ?>
+        <?php foreach ($advancedSettings as $settings){ ?>
+            <?php foreach ($settings as $setting){
+
+                if($setting['default'] != $setting['value']){ ?>
                 <tr>
                     <td>
+                        <strong>
+                            <?php echo $setting['caption'];?>:
+                        </strong>
                     </td>
                     <td>
                         <?php
-                            if (isset($setting->expression) && $setting->expression == 2) {
-                                LimeExpressionManager::ProcessString('{' . $setting->value . '}', $question->qid);
+                            if (isset($setting['expression']) && $setting['expression'] == 2) {
+                                LimeExpressionManager::ProcessString('{' . $setting['value'] . '}', $question->qid);
                                 echo LimeExpressionManager::GetLastPrettyPrintExpression();
                             } else {
-                                //if ($setting->aFormElementOptions->i18n == false) {
-                                    //echo htmlspecialchars($setting->aFormElementOptions->value);
-                                //} else {
-                                    //echo htmlspecialchars($setting['aFormElementOptions'][$question->survey->language]['value']);
-                                //}
+                                if (($setting['i18n'] ==null) || ($setting['i18n'] == false)) {
+                                    echo htmlspecialchars($setting['value']);
+                                } else {
+                                    echo htmlspecialchars($setting[$question->survey->language]['value']);
+                                }
                             }
                         ?>
                     </td>
                 </tr>
-            <?php endforeach; ?>
-        <?php endforeach; ?>
+            <?php
+                }
+            }
+        } ?>
     </table>
 </div>