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

Peer review revision 11671 - please read comments on tracker 

Link to SF Tracker: http://sourceforge.net/support/tracker.php?aid=2214883
This commit is contained in:
Carlos Ruiz 2010-03-17 18:56:04 +00:00
parent 43fc4108f7
commit 9ddd353e0b
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
base/src/org/compiere/model/MAttribute.java
View File

@ -62,13 +62,14 @@ public class MAttribute extends X_M_Attribute
if (onlyListAttributes) if (onlyListAttributes)
{ {
sql += " AND AttributeValueType=?"; sql += " AND AttributeValueType=?";
params.add("L"); params.add(MAttribute.ATTRIBUTEVALUETYPE_List);
} }
final String whereClause = "AD_Client_ID=?"+sql; final String whereClause = "AD_Client_ID=?"+sql;
List<MAttribute>list = new Query(ctx,I_M_Attribute.Table_Name,whereClause,null) List<MAttribute>list = new Query(ctx,I_M_Attribute.Table_Name,whereClause,null)
.setParameters(params.toArray()) .setParameters(params)
.setOnlyActiveRecords(true) .setOnlyActiveRecords(true)
.setOrderBy("Name")
.list(); .list();
MAttribute[] retValue = new MAttribute[list.size ()]; MAttribute[] retValue = new MAttribute[list.size ()];
@ -121,8 +122,12 @@ public class MAttribute extends X_M_Attribute
if (m_values == null && ATTRIBUTEVALUETYPE_List.equals(getAttributeValueType())) if (m_values == null && ATTRIBUTEVALUETYPE_List.equals(getAttributeValueType()))
{ {
final String whereClause = I_M_AttributeValue.COLUMNNAME_M_Attribute_ID+"=?"; final String whereClause = I_M_AttributeValue.COLUMNNAME_M_Attribute_ID+"=?";
List<MAttributeValue>list = new Query(getCtx(),I_M_AttributeValue.Table_Name,whereClause,null) List<MAttributeValue> list = new ArrayList<MAttributeValue>();
if (!isMandatory())
list.add (null);
list = new Query(getCtx(),I_M_AttributeValue.Table_Name,whereClause,null)
.setParameters(getM_Attribute_ID()) .setParameters(getM_Attribute_ID())
.setOrderBy("Value")
.list(); .list();
m_values = new MAttributeValue[list.size()]; m_values = new MAttributeValue[list.size()];
list.toArray(m_values); list.toArray(m_values);
@ -141,7 +146,7 @@ public class MAttribute extends X_M_Attribute
final String whereClause = I_M_AttributeInstance.COLUMNNAME_M_Attribute_ID+"=? AND "+I_M_AttributeInstance.COLUMNNAME_M_AttributeSetInstance_ID+"=?"; final String whereClause = I_M_AttributeInstance.COLUMNNAME_M_Attribute_ID+"=? AND "+I_M_AttributeInstance.COLUMNNAME_M_AttributeSetInstance_ID+"=?";
MAttributeInstance retValue = new Query(getCtx(),I_M_AttributeInstance.Table_Name,whereClause,get_TrxName()) MAttributeInstance retValue = new Query(getCtx(),I_M_AttributeInstance.Table_Name,whereClause,get_TrxName())
.setParameters(getM_Attribute_ID(),M_AttributeSetInstance_ID) .setParameters(getM_Attribute_ID(),M_AttributeSetInstance_ID)
.firstOnly(); .first();
return retValue; return retValue;
} // getAttributeInstance } // getAttributeInstance