details: https://code.openbravo.com/erp/devel/pi/rev/c3de6a9d6209 changeset: 21942:c3de6a9d6209 user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Feb 11 15:24:54 2014 +0100 summary: Fixes issue 25701: Gives proper name to property fields with validations
details: https://code.openbravo.com/erp/devel/pi/rev/1b35c705383f changeset: 21943:1b35c705383f user: Augusto Mauch <augusto.mauch <at> openbravo.com> date: Tue Feb 11 15:26:11 2014 +0100 summary: Related to issue 25630: Updates copyright year diffstat: modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java | 19 ++++++++- 1 files changed, 16 insertions(+), 3 deletions(-) diffs (43 lines): diff -r 1a763d40447c -r 1b35c705383f modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Tue Feb 11 15:16:55 2014 +0100 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java Tue Feb 11 15:26:11 2014 +0100 @@ -11,7 +11,7 @@ * under the License. * The Original Code is Openbravo ERP. * The Initial Developer of the Original Code is Openbravo SLU - * All portions are Copyright (C) 2010-2013 Openbravo SLU + * All portions are Copyright (C) 2010-2014 Openbravo SLU * All Rights Reserved. * Contributor(s): ______________________________________. ************************************************************************ @@ -986,8 +986,16 @@ columns.add(columnName.toUpperCase()); String validation = getValidation(field); if (!validation.equals("")) { - columnsWithValidation.add(field.getColumn().getDBColumnName()); - validations.put(field.getColumn().getDBColumnName(), validation); + String colName = null; + if (field.getProperty() != null && !field.getProperty().isEmpty()) { + colName = "_propertyField_" + + Sqlc.TransformaNombreColumna(field.getName()).replace(" ", "") + "_" + + field.getColumn().getDBColumnName(); + } else { + colName = field.getColumn().getDBColumnName(); + } + columnsWithValidation.add(colName); + validations.put(colName, validation); } } for (String column : columnsWithValidation) { @@ -1076,6 +1084,11 @@ } String colName = field.getColumn().getDBColumnName(); if (colName.equalsIgnoreCase("documentno")) { + if (field.getProperty() != null && !field.getProperty().isEmpty()) { + colName = "_propertyField_" + + Sqlc.TransformaNombreColumna(field.getName()).replace(" ", "") + "_" + + field.getColumn().getDBColumnName(); + } sortedColumns.add(colName); } } ------------------------------------------------------------------------------ Android apps run on BlackBerry 10 Introducing the new BlackBerry 10.2.1 Runtime for Android apps. Now with support for Jelly Bean, Bluetooth, Mapview and more. Get your Android app in front of a whole new audience. Start now. http://pubads.g.doubleclick.net/gampad/clk?id=124407151&iu=/4140/ostg.clktrk _______________________________________________ Openbravo-commits mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/openbravo-commits
