Table total aggregation bottom row does not disappear if showTotalAgg…

…regation is set to false #548
jmix-projects · Jun 28, 2021 · d4d7c00 · d4d7c00
1 parent 0c87310
commit d4d7c00
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/ui/src/main/java/io/jmix/ui/widget/JmixTable.java b/ui/src/main/java/io/jmix/ui/widget/JmixTable.java
@@ -847,7 +847,7 @@ public void beforeClientResponse(boolean initial) {
         updateAggregatableTooltips();
         updateHtmlCaptionColumns();
 
-        if (isAggregatable()) {
+        if (isAggregatable() && isShowTotalAggregation()) {
             if (AggregationStyle.BOTTOM.equals(getAggregationStyle())) {
                 updateFooterAggregation();
             }

diff --git a/ui/src/main/java/io/jmix/ui/widget/JmixTreeTable.java b/ui/src/main/java/io/jmix/ui/widget/JmixTreeTable.java
@@ -847,8 +847,10 @@ public void beforeClientResponse(boolean initial) {
         updateAggregatableTooltips();
         updateHtmlCaptionColumns();
 
-        if (AggregationStyle.BOTTOM.equals(getAggregationStyle())) {
-            updateFooterAggregation();
+        if (isAggregatable() && isShowTotalAggregation()) {
+            if (AggregationStyle.BOTTOM.equals(getAggregationStyle())) {
+                updateFooterAggregation();
+            }
         }
 
         if (focusColumn != null) {