Merge
This commit is contained in:
commit
705f92584f
|
@ -1202,6 +1202,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
|
||||||
//Deepak-Enabling customize button IDEMPIERE-364
|
//Deepak-Enabling customize button IDEMPIERE-364
|
||||||
if(!(curTabpanel instanceof ADSortTab))
|
if(!(curTabpanel instanceof ADSortTab))
|
||||||
toolbar.enableCustomize(((ADTabpanel)curTabpanel).isGridView());
|
toolbar.enableCustomize(((ADTabpanel)curTabpanel).isGridView());
|
||||||
|
else
|
||||||
|
toolbar.enableCustomize(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -2522,8 +2524,8 @@ public abstract class AbstractADWindowPanel extends AbstractUIPart implements To
|
||||||
GridField[] fields = tabPanel.getGridView().getFields();
|
GridField[] fields = tabPanel.getGridView().getFields();
|
||||||
Map<Integer, String> columnsWidth = new HashMap<Integer, String>();
|
Map<Integer, String> columnsWidth = new HashMap<Integer, String>();
|
||||||
ArrayList<Integer> gridFieldIds = new ArrayList<Integer>();
|
ArrayList<Integer> gridFieldIds = new ArrayList<Integer>();
|
||||||
for (int i = 0; i < columnList.size()-1; i++) {
|
for (int i = 0; i < fields.length; i++) {
|
||||||
Column column = (Column) columnList.get(i);
|
Column column = (Column) columnList.get(i+1);
|
||||||
String width = column.getWidth();
|
String width = column.getWidth();
|
||||||
columnsWidth.put(fields[i].getAD_Field_ID(), width);
|
columnsWidth.put(fields[i].getAD_Field_ID(), width);
|
||||||
gridFieldIds.add(fields[i].getAD_Field_ID());
|
gridFieldIds.add(fields[i].getAD_Field_ID());
|
||||||
|
|
Loading…
Reference in New Issue