details: https://code.openbravo.com/erp/devel/pi/rev/00984394b3d2 changeset: 19963:00984394b3d2 user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Sun Mar 24 14:01:34 2013 +0530 summary: Fixes Issue 0022945 : Setting rowSpan and colSpan of Images from fields.
The rowSpan and colSpan provided in the fields tab will be used to display the image in form view. details: https://code.openbravo.com/erp/devel/pi/rev/096f0a4c98fd changeset: 19964:096f0a4c98fd user: Shankar Balachandran <shankar.balachandran <at> openbravo.com> date: Mon Mar 25 00:11:39 2013 +0530 summary: Fixes Issue 23124, Related to Issue 23267 : Selectors as Identifiers When comparing selector columns in ComboData the column name in the table was used to compare with the selector table. This results in exception when the column names are different. In case the selector has the column field, that column is used for comparison avoiding this error. diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js | 12 ++++++++++ modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java | 11 +++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diffs (50 lines): diff -r 5c1786fdfbc9 -r 096f0a4c98fd modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Sun Mar 24 19:20:29 2013 +0100 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js Mon Mar 25 00:11:39 2013 +0530 @@ -983,6 +983,12 @@ } else if (isImage) { //calls setValue to handle buttons display for read-only windows this.setValue(field.name, assignValue); + if (field.rowSpan) { + this.rowSpan = field.rowSpan; + } + if (field.colSpan) { + this.colSpan = field.colSpan; + } } else if (columnValue.hasDateDefault) { this.setItemValue(field.name, columnValue.classicValue); } else { @@ -1024,6 +1030,12 @@ if (isImage) { //calls setValue to handle buttons display for read-only windows this.setValue(field.name, null); + if (field.rowSpan) { + this.rowSpan = field.rowSpan; + } + if (field.colSpan) { + this.colSpan = field.colSpan; + } } this.setItemValue(field.name, null); if (this.getValue(field.name + OB.Constants.FIELDSEPARATOR + OB.Constants.IDENTIFIER)) { diff -r 5c1786fdfbc9 -r 096f0a4c98fd modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java --- a/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Sun Mar 24 19:20:29 2013 +0100 +++ b/modules/org.openbravo.userinterface.selector/src/org/openbravo/userinterface/selector/reference/SelectorUIReference.java Mon Mar 25 00:11:39 2013 +0530 @@ -202,10 +202,13 @@ String parentFieldName = fieldName; String name = ((fieldName != null && !fieldName.equals("")) ? fieldName : comboTableData .getObjectName()); - if (name.startsWith("EM_")) { - // For external module fields use the column field in selector to avoid comparing - // fields with EM_fieldname which will not be present in the current table. - // Refer issue https://issues.openbravo.com/view.php?id=23267 + /* + * if the column name is available in selector use that for comparison as it is the column + * that is going to be saved. Solves issues + * https://issues.openbravo.com/view.php?id=23267, + * https://issues.openbravo.com/view.php?id=23124 + */ + if (selector.getColumn() != null) { name = selector.getColumn().getDBColumnName(); } String tableDirName; ------------------------------------------------------------------------------ Everyone hates slow websites. So do we. Make your web apps faster with AppDynamics Download AppDynamics Lite for free today: http://p.sf.net/sfu/appdyn_d2d_mar _______________________________________________ Openbravo-commits mailing list Openbravo-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/openbravo-commits
