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

IDEMPIERE-5000 Window Customization Field does not show fields that are not displayed in the Window>Tab>Field sytem record (#922)

This commit is contained in:
Diego Ruiz 2021-10-13 16:14:59 +02:00 committed by GitHub
parent 6dd60f30c7
commit c9354bca85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 79 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
org.adempiere.base/src/org/compiere/model/GridFieldVO.java
View File

@ -117,90 +117,87 @@ public class GridFieldVO implements Serializable, Cloneable
} }
// FR IDEMPIERE-177 // FR IDEMPIERE-177
// Field Customization // Field Customization
if (vo.IsDisplayed) { MUserDefField userDef = MUserDefField.get(vo.ctx,vo.AD_Field_ID, vo.AD_Tab_ID, vo.AD_Window_ID);
MUserDefField userDef = null; if (userDef != null)
userDef = MUserDefField.get(vo.ctx,vo.AD_Field_ID, vo.AD_Tab_ID, vo.AD_Window_ID); {
if (userDef != null) if (userDef.getName() != null)
{ vo.Header = userDef.getName();
if (userDef.getName() != null) if (userDef.getDescription() != null)
vo.Header = userDef.getName(); vo.Description = userDef.getDescription();
if (userDef.getDescription() != null) if (userDef.getHelp() != null)
vo.Description = userDef.getDescription(); vo.Help = userDef.getHelp();
if (userDef.getHelp() != null) if (userDef.getDisplayLength() > 0)
vo.Help = userDef.getHelp(); vo.DisplayLength = userDef.getDisplayLength();
if (userDef.getDisplayLength() > 0) if (userDef.getDisplayLogic() != null)
vo.DisplayLength = userDef.getDisplayLength(); vo.DisplayLogic = userDef.getDisplayLogic();
if (userDef.getDisplayLogic() != null) if (userDef.getDefaultValue() != null)
vo.DisplayLogic = userDef.getDisplayLogic(); vo.DefaultValue = userDef.getDefaultValue();
if (userDef.getDefaultValue() != null) if (userDef.getSortNo() > 0)
vo.DefaultValue = userDef.getDefaultValue(); vo.SortNo = userDef.getSortNo();
if (userDef.getSortNo() > 0) //IDEMPIERE-163
vo.SortNo = userDef.getSortNo(); if (userDef.getIsDisplayed()!= null)
//IDEMPIERE-163 vo.IsDisplayed = "Y".equals(userDef.getIsDisplayed());
if (userDef.getIsDisplayed()!= null) if (userDef.getIsReadOnly()!= null)
vo.IsDisplayed = "Y".equals(userDef.getIsDisplayed()); vo.IsReadOnly = "Y".equals(userDef.getIsReadOnly());
if (userDef.getIsReadOnly()!= null) if (userDef.getIsSameLine()!= null)
vo.IsReadOnly = "Y".equals(userDef.getIsReadOnly()); vo.IsSameLine = "Y".equals(userDef.getIsSameLine());
if (userDef.getIsSameLine()!= null) if (userDef.getIsUpdateable()!= null)
vo.IsSameLine = "Y".equals(userDef.getIsSameLine()); vo.IsUpdateable = "Y".equals(userDef.getIsUpdateable());
if (userDef.getIsUpdateable()!= null) if (userDef.getIsAlwaysUpdateable()!= null)
vo.IsUpdateable = "Y".equals(userDef.getIsUpdateable()); vo.IsAlwaysUpdateable = "Y".equals(userDef.getIsAlwaysUpdateable());
if (userDef.getIsAlwaysUpdateable()!= null) if (userDef.getReadOnlyLogic()!= null)
vo.IsAlwaysUpdateable = "Y".equals(userDef.getIsAlwaysUpdateable()); vo.ReadOnlyLogic = userDef.getReadOnlyLogic();
if (userDef.getReadOnlyLogic()!= null) if (userDef.getMandatoryLogic()!= null )
vo.ReadOnlyLogic = userDef.getReadOnlyLogic(); vo.MandatoryLogic = userDef.getMandatoryLogic();
if (userDef.getMandatoryLogic()!= null ) if (userDef.getAD_Reference_ID()>0)
vo.MandatoryLogic = userDef.getMandatoryLogic(); vo.displayType = userDef.getAD_Reference_ID();
if (userDef.getAD_Reference_ID()>0) if (userDef.getAD_Reference_Value_ID()>0)
vo.displayType = userDef.getAD_Reference_ID(); vo.AD_Reference_Value_ID = userDef.getAD_Reference_Value_ID();
if (userDef.getAD_Reference_Value_ID()>0) if (userDef.getIsMandatory()!= null)
vo.AD_Reference_Value_ID = userDef.getAD_Reference_Value_ID(); vo.IsMandatory = "Y".equals(userDef.getIsMandatory());
if (userDef.getIsMandatory()!= null) if (userDef.getXPosition() > 0)
vo.IsMandatory = "Y".equals(userDef.getIsMandatory()); vo.XPosition = userDef.getXPosition();
if (userDef.getXPosition() > 0) if (userDef.getColumnSpan() > 0)
vo.XPosition = userDef.getXPosition(); vo.ColumnSpan=userDef.getColumnSpan();
if (userDef.getColumnSpan() > 0) if (userDef.getNumLines() > 0)
vo.ColumnSpan=userDef.getColumnSpan(); vo.NumLines=userDef.getNumLines();
if (userDef.getNumLines() > 0) if (userDef.getIsToolbarButton() != null)
vo.NumLines=userDef.getNumLines(); vo.IsToolbarButton = userDef.getIsToolbarButton();
if (userDef.getIsToolbarButton() != null) if (userDef.getVFormat() != null)
vo.IsToolbarButton = userDef.getIsToolbarButton(); vo.VFormat = userDef.getVFormat();
if (userDef.getVFormat() != null) //IDEMPIERE-1120 Implement Field SeqNo customization
vo.VFormat = userDef.getVFormat(); if (userDef.getSeqNo() > 0)
//IDEMPIERE-1120 Implement Field SeqNo customization vo.SeqNo = userDef.getSeqNo();
if (userDef.getSeqNo() > 0) if (userDef.getIsDisplayedGrid() != null)
vo.SeqNo = userDef.getSeqNo(); vo.IsDisplayedGrid = "Y".equals(userDef.getIsDisplayedGrid());
if (userDef.getIsDisplayedGrid() != null) if (userDef.getSeqNoGrid() > 0)
vo.IsDisplayedGrid = "Y".equals(userDef.getIsDisplayedGrid()); vo.SeqNoGrid = userDef.getSeqNoGrid();
if (userDef.getSeqNoGrid() > 0) if (userDef.getAD_Val_Rule_ID() > 0)
vo.SeqNoGrid = userDef.getSeqNoGrid(); vo.ValidationCode = MValRule.get(vo.ctx, userDef.getAD_Val_Rule_ID()).getCode();
if (userDef.getAD_Val_Rule_ID() > 0) if (userDef.getAD_Val_Rule_Lookup_ID() > 0)
vo.ValidationCode = MValRule.get(vo.ctx, userDef.getAD_Val_Rule_ID()).getCode(); vo.ValidationCodeLookup = MValRule.get(ctx, userDef.getAD_Val_Rule_Lookup_ID()).getCode();
if (userDef.getAD_Val_Rule_Lookup_ID() > 0) if (userDef.getAD_LabelStyle_ID() > 0)
vo.ValidationCodeLookup = MValRule.get(ctx, userDef.getAD_Val_Rule_Lookup_ID()).getCode(); vo.AD_LabelStyle_ID = userDef.getAD_LabelStyle_ID();
if (userDef.getAD_LabelStyle_ID() > 0)
vo.AD_LabelStyle_ID = userDef.getAD_LabelStyle_ID();
if (userDef.getAD_FieldStyle_ID() > 0)
vo.AD_FieldStyle_ID = userDef.getAD_FieldStyle_ID();
if (userDef.getPA_DashboardContent_ID() > 0)
vo.PA_DashboardContent_ID = userDef.getPA_DashboardContent_ID();
if (userDef.getPlaceholder() != null) if (userDef.getAD_FieldStyle_ID() > 0)
vo.Placeholder = userDef.getPlaceholder(); vo.AD_FieldStyle_ID = userDef.getAD_FieldStyle_ID();
//devCoffee 8535 if (userDef.getPA_DashboardContent_ID() > 0)
if (userDef.getAD_FieldGroup_ID() > 0) vo.PA_DashboardContent_ID = userDef.getPA_DashboardContent_ID();
{
vo.FieldGroup = ((X_AD_FieldGroup)userDef.getAD_FieldGroup()).get_Translation(I_AD_FieldGroup.COLUMNNAME_Name); if (userDef.getPlaceholder() != null)
vo.FieldGroupType = userDef.getAD_FieldGroup().getFieldGroupType(); vo.Placeholder = userDef.getPlaceholder();
}
//fim devCoffee 8535 //devCoffee 8535
if (userDef.getAD_FieldGroup_ID() > 0)
if (userDef.getIsAutocomplete() != null) {
vo.IsAutocomplete = "Y".equals(userDef.getIsAutocomplete()); vo.FieldGroup = ((X_AD_FieldGroup)userDef.getAD_FieldGroup()).get_Translation(I_AD_FieldGroup.COLUMNNAME_Name);
vo.FieldGroupType = userDef.getAD_FieldGroup().getFieldGroupType();
} }
//fim devCoffee 8535
if (userDef.getIsAutocomplete() != null)
vo.IsAutocomplete = "Y".equals(userDef.getIsAutocomplete());
} }
// //
vo.initFinish(); vo.initFinish();