test/cuba
1
0
Fork 0
mirror of https://gitee.com/jmix/cuba.git synced 2024-12-04 20:28:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not apply cuba.web.table.cacheRate for Tables with generated columns #PL-5910

Browse Source
This commit is contained in:
Yuriy Artamonov 2015-09-14 08:35:23 +00:00
parent ecea8d6cdc
commit d92a1e8b66
4 changed files with 45 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/web/src/com/haulmont/cuba/web/gui/components/WebAbstractTable.java
View File

@ -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;

7
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaEnhancedTable.java
View File

@ -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 {
}
}

18
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTable.java
View File

@ -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) {

18
modules/web/src/com/haulmont/cuba/web/toolkit/ui/CubaTreeTable.java
View File

@ -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);