details: https://code.openbravo.com/erp/devel/pi/rev/e12313681d03 changeset: 14085:e12313681d03 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Oct 26 13:36:38 2011 +0200 summary: Fixes issue 18854: Not displayed but shown in grid Still compute combos if not displayed but present in the grid
details: https://code.openbravo.com/erp/devel/pi/rev/5f39a1051539 changeset: 14086:5f39a1051539 user: Martin Taal <martin.taal <at> openbravo.com> date: Wed Oct 26 13:37:44 2011 +0200 summary: Fixes issue 18879: Form layout not opening Prevent js error when opening the form through the form layouter diffstat: modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js | 2 +- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java | 5 +++-- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java | 4 ++-- modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java | 4 ++++ 4 files changed, 10 insertions(+), 5 deletions(-) diffs (53 lines): diff -r 40bc1905d008 -r 5f39a1051539 modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Tue Oct 25 12:54:19 2011 +0200 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-statusbar.js Wed Oct 26 13:37:44 2011 +0200 @@ -365,7 +365,7 @@ if (i !== 0 || this.statusCode) { msg += '<span class="' + (this.separatorLabelStyle?this.separatorLabelStyle:'') + '">' + ' | ' + '</span>'; } - if (typeof arrayTitleField[2][i] !== 'undefined' && typeof arrayTitleField[3][i] !== 'undefined' && typeof arrayTitleField[4][i] !== 'undefined' && typeof arrayTitleField[5][i] !== 'undefined') { + if (arrayTitleField.length === 6 && typeof arrayTitleField[2][i] !== 'undefined' && typeof arrayTitleField[3][i] !== 'undefined' && typeof arrayTitleField[4][i] !== 'undefined' && typeof arrayTitleField[5][i] !== 'undefined') { msg += '<span class="' + (this.titleLinkStyle?this.titleLinkStyle:'') + '" onclick="OB.Utilities.openDirectView(\'' + arrayTitleField[2][i] + '\', \'' + arrayTitleField[3][i] + '\', \'' + arrayTitleField[4][i] + '\', \'' + arrayTitleField[5][i] + '\')">' + arrayTitleField[0][i] + ': <img src="' + (this.titleLinkImageSrc?this.titleLinkImageSrc:'') + '" style="' + linkImageWidth + linkImageHeight + '" /> ' + diff -r 40bc1905d008 -r 5f39a1051539 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java Tue Oct 25 12:54:19 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/EnumUIDefinition.java Wed Oct 26 13:37:44 2011 +0200 @@ -65,8 +65,9 @@ JSONObject value; try { value = new JSONObject(super.getFieldProperties(field, getValueFromSession)); - if (!field.isDisplayed() && field.getColumn().getDefaultValue() == null - && !field.getColumn().isMandatory()) { + if (!getSafeBoolean(field.isDisplayed()) && !getSafeBoolean(field.isShowInGridView()) + && field.getColumn().getDefaultValue() == null + && !getSafeBoolean(field.getColumn().isMandatory())) { return value.toString(); } if (!getValueFromSession diff -r 40bc1905d008 -r 5f39a1051539 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java Tue Oct 25 12:54:19 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/FKComboUIDefinition.java Wed Oct 26 13:37:44 2011 +0200 @@ -46,8 +46,8 @@ JSONObject value; try { value = new JSONObject(super.getFieldProperties(field, getValueFromSession)); - if (!field.isDisplayed() && field.getColumn().getDefaultValue() == null - && !field.getColumn().isMandatory()) { + if (!getSafeBoolean(field.isDisplayed()) && !getSafeBoolean(field.isShowInGridView()) + && field.getColumn().getDefaultValue() == null && !field.getColumn().isMandatory()) { return value.toString(); } return getValueInComboReference(field, getValueFromSession, value.getString("classicValue")); diff -r 40bc1905d008 -r 5f39a1051539 modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java --- a/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Tue Oct 25 12:54:19 2011 +0200 +++ b/modules/org.openbravo.client.kernel/src/org/openbravo/client/kernel/reference/UIDefinition.java Wed Oct 26 13:37:44 2011 +0200 @@ -596,4 +596,8 @@ public String formatValueToSQL(java.lang.String value) { return value; } + + protected boolean getSafeBoolean(Boolean value) { + return value != null && value; + } } ------------------------------------------------------------------------------ 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@Cisco 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
