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

PL-8096 In windows.xsd rename "columnsQty" attribute of the filter component to "columnsCount"

Browse Source
This commit is contained in:
Maxim Gorbunkov 2016-12-02 12:20:53 +04:00
parent 3fc01a1fb0
commit 9dc1a6d762
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/gui/src/com/haulmont/cuba/gui/components/filter/edit/ConditionFrame.java
View File

@ -66,8 +66,8 @@ public abstract class ConditionFrame<T extends AbstractCondition> extends Abstra
if (width != null) {
List<Integer> widthValues = new ArrayList<>();
int conditionsColumnsQty = filter != null ? filter.getColumnsCount() : clientConfig.getGenericFilterColumnsCount();
for (int i = 1; i <= conditionsColumnsQty; i++) {
int conditionsColumnsCount = filter != null ? filter.getColumnsCount() : clientConfig.getGenericFilterColumnsCount();
for (int i = 1; i <= conditionsColumnsCount; i++) {
widthValues.add(i);
}
width.setOptionsList(widthValues);

2
modules/gui/src/com/haulmont/cuba/gui/window.xsd
View File

@ -1286,7 +1286,7 @@
<xs:attribute name="manualApplyRequired" type="xs:boolean"/>
<xs:attribute name="editable" type="xs:boolean"/>
<xs:attribute name="folderActionsEnabled" type="xs:boolean"/>
<xs:attribute name="columnsQty" type="xs:int"/>
<xs:attribute name="columnsCount" type="xs:int"/>
<xs:attribute name="collapsable" type="xs:boolean"/>
<xs:attribute name="collapsed" type="xs:boolean"/>
<xs:attribute name="defaultMode">

6
modules/gui/src/com/haulmont/cuba/gui/xml/layout/loaders/FilterLoader.java
View File

@ -75,9 +75,9 @@ public class FilterLoader extends AbstractComponentLoader<Filter> {
String editable = element.attributeValue("editable");
resultComponent.setEditable(editable == null || Boolean.parseBoolean(editable));
String columnsQty = element.attributeValue("columnsCount");
if (!Strings.isNullOrEmpty(columnsQty)) {
resultComponent.setColumnsCount(Integer.parseInt(columnsQty));
String columnsCount = element.attributeValue("columnsCount");
if (!Strings.isNullOrEmpty(columnsCount)) {
resultComponent.setColumnsCount(Integer.parseInt(columnsCount));
}
String folderActionsEnabled = element.attributeValue("folderActionsEnabled");