Comparison tweaks (#14923)

* Do not display limit control when comparing.

* Only show separate dimensions if supposed to in comparison view.

2 files changed, 3 insertions, 1 deletions

diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
index 337bb233b2..2082700c88 100644
--- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
+++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Evolution.php
@@ -62,6 +62,8 @@ class Evolution extends JqplotGraph
         $this->config->custom_parameters['columns'] = $this->config->columns_to_display;
 
         if ($this->isComparing()) {
+            $this->config->show_limit_control = false; // since we always show the days over the period, there's no point in changing the limit
+
             $requestArray = $this->request->getRequestArray();
             $requestArray = ApiRequest::getRequestArrayFromString($requestArray);
 
diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig
index fec4652ed4..2a5852b21f 100644
--- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig
+++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig
@@ -42,7 +42,7 @@
             <span class="label">{{ comparisonLabel }}</span>
         </td>
         {% for dimension in dimensions %}
-        {% if loop.index0 != 0 %}
+        {% if loop.index0 != 0 and dimension in properties.columns_to_display %}
         <td class="label">
             &nbsp;
         </td>