details: https://code.openbravo.com/erp/devel/pi/rev/214139964fd9 changeset: 14038:214139964fd9 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Oct 20 16:56:44 2011 +0200 summary: Fixed issue 18809. Attribute Set Instance selectors will work correctly when editing the grid
details: https://code.openbravo.com/erp/devel/pi/rev/6dac50585cc3 changeset: 14039:6dac50585cc3 user: Antonio Moreno <antonio.moreno <at> openbravo.com> date: Thu Oct 20 17:10:05 2011 +0200 summary: Related to issue 18375. Set Action column as mandatory diffstat: modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java | 8 +-- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java | 30 ++++++++- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java | 1 + modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java | 4 - src-db/database/model/tables/AD_COLUMN.xml | 2 +- src-db/database/sourcedata/AD_COLUMN.xml | 1 + 6 files changed, 30 insertions(+), 16 deletions(-) diffs (124 lines): diff -r f91d12c55f35 -r 6dac50585cc3 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java Thu Oct 20 15:58:17 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/ForeignKeyUIDefinition.java Thu Oct 20 17:10:05 2011 +0200 @@ -46,10 +46,6 @@ @Override public String getGridFieldProperties(Field field) { - Long length = field.getDisplayedLength(); - if (length == null || length == 0) { - length = field.getColumn().getLength(); - } final Property prop = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn()); // only output when really needed @@ -57,8 +53,8 @@ if (getDisplayFieldName(field, prop) != null) { displayField = ", displayField: '" + getDisplayFieldName(field, prop) + "'"; } - return ", length:" + length + displayField + ",fkField: true" - + super.getGridFieldProperties(field) + getShowHoverGridFieldSettings(field); + return displayField + ",fkField: true" + super.getGridFieldProperties(field) + + getShowHoverGridFieldSettings(field); } /** diff -r f91d12c55f35 -r 6dac50585cc3 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java Thu Oct 20 15:58:17 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/StringUIDefinition.java Thu Oct 20 17:10:05 2011 +0200 @@ -18,6 +18,8 @@ */ package org.openbravo.client.kernel.reference; +import org.codehaus.jettison.json.JSONObject; +import org.openbravo.base.exception.OBException; import org.openbravo.model.ad.ui.Field; /** @@ -43,15 +45,33 @@ } @Override + public String getFieldProperties(Field field) { + String fieldProperties = super.getFieldProperties(field); + if (field != null && field.getColumn() != null) { + final Long length = field.getColumn().getLength(); + try { + if (length != null) { + JSONObject o = new JSONObject( + fieldProperties != null && fieldProperties.length() > 0 ? fieldProperties : "{}"); + o.put("length", length); + return o.toString(); + } + } catch (Exception e) { // ignore + throw new OBException(e); + } + } + return fieldProperties; + } + + @Override public String getGridFieldProperties(Field field) { - Long length = field.getDisplayedLength(); - if (length == null || length == 0) { - length = field.getColumn().getLength(); - } + Long length = field.getColumn().getLength(); + // custom override if (field.getColumn().getDBColumnName().compareToIgnoreCase("documentno") == 0) { length = new Long(20); } - return getShowHoverGridFieldSettings(field) + super.getGridFieldProperties(field); + return getShowHoverGridFieldSettings(field) + (length != null ? ", length:" + length : "") + + super.getGridFieldProperties(field); } } diff -r f91d12c55f35 -r 6dac50585cc3 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java Thu Oct 20 15:58:17 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/TextUIDefinition.java Thu Oct 20 17:10:05 2011 +0200 @@ -35,6 +35,7 @@ @Override public String getGridFieldProperties(Field field) { final Property property = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn()); + final Long length = field.getColumn().getLength(); // anything above 2000 is probably a clob return super.getGridFieldProperties(field) + ", canSort: false" diff -r f91d12c55f35 -r 6dac50585cc3 modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java --- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java Thu Oct 20 15:58:17 2011 +0200 +++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/FKSelectorUIDefinition.java Thu Oct 20 17:10:05 2011 +0200 @@ -99,10 +99,6 @@ @Override protected String getDisplayFieldName(Field field, Property prop) { - Long length = field.getDisplayedLength(); - if (length == null || length == 0) { - length = field.getColumn().getLength(); - } final Selector selector = getSelector(field); final SelectorField displayField = selector.getDisplayfield(); String displayFieldName = JsonConstants.IDENTIFIER; diff -r f91d12c55f35 -r 6dac50585cc3 src-db/database/model/tables/AD_COLUMN.xml --- a/src-db/database/model/tables/AD_COLUMN.xml Thu Oct 20 15:58:17 2011 +0200 +++ b/src-db/database/model/tables/AD_COLUMN.xml Thu Oct 20 17:10:05 2011 +0200 @@ -185,7 +185,7 @@ <default><![CDATA[N]]></default> <onCreateDefault><![CDATA['N']]></onCreateDefault> </column> - <column name="IMAGESIZEVALUESACTION" primaryKey="false" required="false" type="VARCHAR" size="60" autoIncrement="false"> + <column name="IMAGESIZEVALUESACTION" primaryKey="false" required="true" type="VARCHAR" size="60" autoIncrement="false"> <default/> <onCreateDefault><![CDATA['N']]></onCreateDefault> </column> diff -r f91d12c55f35 -r 6dac50585cc3 src-db/database/sourcedata/AD_COLUMN.xml --- a/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 20 15:58:17 2011 +0200 +++ b/src-db/database/sourcedata/AD_COLUMN.xml Thu Oct 20 17:10:05 2011 +0200 @@ -218032,6 +218032,7 @@ <!--3AE62A8262C1481EB0AA36315B026371--> <ISTRANSIENT><![CDATA[N]]></ISTRANSIENT> <!--3AE62A8262C1481EB0AA36315B026371--> <ISAUTOSAVE><![CDATA[Y]]></ISAUTOSAVE> <!--3AE62A8262C1481EB0AA36315B026371--> <VALIDATEONNEW><![CDATA[Y]]></VALIDATEONNEW> +<!--3AE62A8262C1481EB0AA36315B026371--> <IMAGESIZEVALUESACTION><![CDATA[N]]></IMAGESIZEVALUESACTION> <!--3AE62A8262C1481EB0AA36315B026371--></AD_COLUMN> <!--3B0B06935CE4426AB45EA841B598C5CB--><AD_COLUMN> ------------------------------------------------------------------------------ The demand for IT networking professionals continues to grow, and the demand for specialized networking skills is growing even more rapidly. Take a complimentary Learning@Ciosco Self-Assessment and learn about Cisco certifications, training, and career opportunities. http://p.sf.net/sfu/cisco-dev2dev _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
