From d92a1e8b6613062a3a2451155e49e0cd3d48239a Mon Sep 17 00:00:00 2001
From: Yuriy Artamonov <artamonov@haulmont.com>
Date: Mon, 14 Sep 2015 08:35:23 +0000
Subject: [PATCH] Do not apply cuba.web.table.cacheRate for Tables with
 generated columns #PL-5910

---
 .../web/gui/components/WebAbstractTable.java   |  3 ++-
 .../cuba/web/toolkit/ui/CubaEnhancedTable.java |  7 +++++++
 .../cuba/web/toolkit/ui/CubaTable.java         | 18 ++++++++++++++++++
 .../cuba/web/toolkit/ui/CubaTreeTable.java     | 18 ++++++++++++++++++
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java b/modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java
index 2a5b79e773..e851e141b4 100644
--- a/modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java
+++ b/modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java
@@ -1878,7 +1878,8 @@ public abstract class WebAbstractTable<T extends com.vaadin.ui.Table & CubaEnhan
         }
     }
 
-    protected static class AbbreviatedColumnGenerator implements SystemTableColumnGenerator {
+    protected static class AbbreviatedColumnGenerator implements SystemTableColumnGenerator,
+                                                                 CubaEnhancedTable.PlainTextGeneratedColumn {
 
         protected Table.Column column;
 
diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java
index 1358f446df..156b35c747 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java
@@ -77,4 +77,11 @@ public interface CubaEnhancedTable extends AggregationContainer {
     interface CellClickListener {
         void onClick(Object itemId, Object columnId);
     }
+
+    /**
+     * Marker interface for generated columns which return String value.
+     * Used to work with custom cacheRate and pageLength.
+     */
+    interface PlainTextGeneratedColumn {
+    }
 }
\ No newline at end of file
diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java
index c71a12fb55..2d188f38a0 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java
@@ -263,6 +263,13 @@ public class CubaTable extends com.vaadin.ui.Table implements TableContainer, Cu
             throw new IllegalArgumentException(
                     "Can not add the same GeneratedColumn twice, id:" + id);
         } else {
+            if (!(generatedColumn instanceof PlainTextGeneratedColumn)) {
+                // do not use custom cache row settings for table with generated columns
+                if (getCacheRate() != 2) {
+                    setCacheRate(2);
+                }
+            }
+
             columnGenerators.put(id, generatedColumn);
             /*
              * add to visible column list unless already there (overriding
@@ -280,6 +287,17 @@ public class CubaTable extends com.vaadin.ui.Table implements TableContainer, Cu
         }
     }
 
+    @Override
+    public void setEditable(boolean editable) {
+        super.setEditable(editable);
+
+        if (editable) {
+            if (getCacheRate() != 2) {
+                setCacheRate(2);
+            }
+        }
+    }
+
     @Override
     public void addShortcutListener(ShortcutListener shortcut) {
         if (shortcutActionManager == null) {
diff --git a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java
index 2e61cd3592..f920f67ebe 100644
--- a/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java
+++ b/modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java
@@ -333,6 +333,13 @@ public class CubaTreeTable extends com.vaadin.ui.TreeTable implements TreeTableC
             throw new IllegalArgumentException(
                     "Can not add the same GeneratedColumn twice, id:" + id);
         } else {
+            if (!(generatedColumn instanceof PlainTextGeneratedColumn)) {
+                // do not use custom cache row settings for table with generated columns
+                if (getCacheRate() != 2) {
+                    setCacheRate(2);
+                }
+            }
+
             columnGenerators.put(id, generatedColumn);
             /*
              * add to visible column list unless already there (overriding
@@ -350,6 +357,17 @@ public class CubaTreeTable extends com.vaadin.ui.TreeTable implements TreeTableC
         }
     }
 
+    @Override
+    public void setEditable(boolean editable) {
+        super.setEditable(editable);
+
+        if (editable) {
+            if (getCacheRate() != 2) {
+                setCacheRate(2);
+            }
+        }
+    }
+
     @Override
     protected boolean changeVariables(Map<String, Object> variables) {
         boolean clientNeedsContentRefresh = super.changeVariables(variables);