midsuit
/
core-jgi
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

IDEMPIERE-1835 CSV Exporter is exporting fields that are not displayed to the user / based on patch from Juan Arboleda (jarboleda)

This commit is contained in:
Carlos Ruiz 2014-03-19 20:52:52 -05:00
parent 0543cd8685
commit 508a0dcb9b
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.adempiere.base/src/org/adempiere/impexp/GridTabCSVExporter.java
View File

@ -104,6 +104,8 @@ public class GridTabCSVExporter implements IGridTabExporter
if(DisplayType.Location == field.getDisplayType()){ if(DisplayType.Location == field.getDisplayType()){
specialHDispayType = DisplayType.Location; specialHDispayType = DisplayType.Location;
continue; continue;
} else if (! (field.isDisplayed() || field.isDisplayedGrid())) {
continue;
} }
String headName = resolveColumnName(table, column); String headName = resolveColumnName(table, column);
headArray.add(headName); headArray.add(headName);
@ -525,7 +527,10 @@ public class GridTabCSVExporter implements IGridTabExporter
int AD_Field_ID = Integer.parseInt(fieldIdStr); int AD_Field_ID = Integer.parseInt(fieldIdStr);
for (GridField gridField : tmpFields) for (GridField gridField : tmpFields)
{ {
if(gridField.isVirtualColumn() || gridField.isEncrypted() || gridField.isEncryptedColumn()) if ( gridField.isVirtualColumn()
|| gridField.isEncrypted()
|| gridField.isEncryptedColumn()
|| !(gridField.isDisplayed() || gridField.isDisplayedGrid()))
continue; continue;
if (gridField.getAD_Field_ID() == AD_Field_ID) if (gridField.getAD_Field_ID() == AD_Field_ID)
@ -549,7 +554,10 @@ public class GridTabCSVExporter implements IGridTabExporter
continue; continue;
if (DisplayType.Button == MColumn.get(Env.getCtx(),field.getAD_Column_ID()).getAD_Reference_ID()) if (DisplayType.Button == MColumn.get(Env.getCtx(),field.getAD_Column_ID()).getAD_Reference_ID())
continue; continue;
if (field.isVirtualColumn() || field.isEncrypted() || field.isEncryptedColumn()) if ( field.isVirtualColumn()
|| field.isEncrypted()
|| field.isEncryptedColumn()
|| !(field.isDisplayed() || field.isDisplayedGrid()))
continue; continue;
if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid())) if (field.isParentValue() || (!field.isReadOnly() && field.isDisplayedGrid()))
gridFieldList.add(field); gridFieldList.add(field);