diff --git a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml --- a/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml +++ b/modules/org.openbravo.client.application/src-db/database/sourcedata/AD_MESSAGE.xml @@ -1253,6 +1253,18 @@ + + + + + + + + + + + + diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/templates/ob-view-grid.js.ftl @@ -39,6 +39,10 @@ filterName: '${data.filterName?js_string}', + requiredGridProperties: [ + <#list data.requiredGridProperties as property> + '${property?js_string}'<#if property_has_next>, + ], // the this is the view instance fields: this.gridFields }) diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java b/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 +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/FormInitializationComponent.java @@ -821,13 +821,21 @@ // database if (mode.equals("EDIT") && !dataSourceBasedTable) { // In EDIT mode we initialize them from the database - for (Field field : fields) { - if (field.getColumn() == null) { - continue; - } - setValueOfColumnInRequest(row, field, field.getColumn().getDBColumnName()); + List columns = getADColumnList(tab.getTable().getId()); + for (Column column : columns) { + setValueOfColumnInRequest(row, null, column.getDBColumnName()); } } + + List gridVisibleProperties = new ArrayList(); + if (jsContent.has("_visibleProperties")) { + try { + gridVisibleProperties = convertJSONArray(jsContent.getJSONArray("_gridVisibleProperties")); + } catch (JSONException e) { + log.error("Error while retrieving _gridVisibleProperties from jsContent" + jsContent, e); + } + } + // and then overwrite with what gets passed in if (mode.equals("EDIT") || mode.equals("CHANGE") || mode.equals("SETSESSION")) { // In CHANGE and SETSESSION we get them from the request @@ -835,7 +843,14 @@ if (field.getColumn() == null) { continue; } + // Do not overwrite the value of fields that are not visible in the grid, because they are + // empty in the request + final Property prop = KernelUtils.getInstance().getPropertyFromColumn(field.getColumn()); + if ((mode.equals("EDIT") || mode.equals("SETSESSION")) + && !gridVisibleProperties.contains(prop.getName())) { + continue; + } String inpColName = "inp" + Sqlc.TransformaNombreColumna(field.getColumn().getDBColumnName()); try { diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewFieldHandler.java @@ -73,6 +73,7 @@ private List windowEntities = null; private List fields; + private List propertiesInButtonFieldDisplayLogic = new ArrayList(); private List ignoredFields = new ArrayList(); @@ -94,7 +95,8 @@ } public List getFields() { - + final Entity entity = ModelProvider.getInstance().getEntityByTableId( + getTab().getTable().getId()); if (fields != null) { return fields; } @@ -129,6 +131,13 @@ if (!fieldsInDynamicExpression.contains(fieldExpression)) { fieldsInDynamicExpression.add(fieldExpression); } + if ("Button".equals(f.getColumn().getReference().getName())) { + Property property = entity.getPropertyByColumnName(fieldExpression.getColumn() + .getDBColumnName()); + if (!propertiesInButtonFieldDisplayLogic.contains(property.getName())) { + propertiesInButtonFieldDisplayLogic.add(property.getName()); + } + } } } @@ -2027,4 +2036,9 @@ getFields(); // initializes stuff return ignoredFields; } + + public List getPropertiesInButtonFieldDisplayLogic() { + return propertiesInButtonFieldDisplayLogic; + } + } diff --git a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java --- a/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java +++ b/modules/org.openbravo.client.application/src/org/openbravo/client/application/window/OBViewGridComponent.java @@ -18,11 +18,14 @@ */ package org.openbravo.client.application.window; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import org.openbravo.base.model.Entity; import org.openbravo.base.model.ModelProvider; +import org.openbravo.base.model.Property; import org.openbravo.client.application.window.OBViewFieldHandler.OBViewField; import org.openbravo.client.application.window.OBViewFieldHandler.OBViewFieldDefinition; import org.openbravo.client.kernel.BaseTemplateComponent; @@ -231,4 +234,27 @@ this.viewTab = viewTab; } + /** + * Returns the string representation of an array that contains all the properties that must always + * be returned from the datasource when the grid asks for data: - id - all the properties that + * compose the identifier of the entity - all the properties that are part of the display logic of + * the tab buttons + */ + public List getRequiredGridProperties() { + List requiredGridProperties = new ArrayList(); + requiredGridProperties.add("id"); + + for (Property identifierProperty : this.entity.getIdentifierProperties()) { + requiredGridProperties.add(identifierProperty.getName()); + } + + List propertiesInButtonFieldDisplayLogic = getViewTab().getFieldHandler() + .getPropertiesInButtonFieldDisplayLogic(); + + for (String propertyName : propertiesInButtonFieldDisplayLogic) { + requiredGridProperties.add(propertyName); + } + + return requiredGridProperties; + } } diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js b/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 +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/form/ob-view-form.js @@ -567,7 +567,9 @@ var parentId = this.view.getParentId(), i, fldNames = [], requestParams, allProperties, parentColumn, me = this, - mode, length = this.getFields().length; + mode, length = this.getFields().length, + gridVisibleProperties = [], + len; this.setParentDisplayInfo(); @@ -593,6 +595,18 @@ requestParams[parentColumn] = parentId; } + if (this.view && this.view.viewGrid && this.view.viewGrid.fields) { + gridVisibleProperties.push('id'); + len = this.view.viewGrid.fields.length; + for (i = 0; i < len; i++) { + if (this.view.viewGrid.fields[i].name[0] !== '_') { + gridVisibleProperties.push(this.view.viewGrid.fields[i].name); + } + } + allProperties._gridVisibleProperties = gridVisibleProperties; + } + + allProperties._entityName = this.view.entity; // only put the visible field names in the call @@ -1958,4 +1972,4 @@ } return true; } -}; \ No newline at end of file +}; diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-grid.js @@ -711,7 +711,8 @@ dsURL = this.dataSource.dataURL; var sortCriteria; var lcriteria = this.getCriteria(); - var gdata = this.getData(); + var gdata = this.getData(), + isExporting = true; if (gdata && gdata.dataSource) { lcriteria = gdata.dataSource.convertRelativeDates(lcriteria); } @@ -728,7 +729,7 @@ exportToFile: true, _textMatchStyle: 'substring', _UTCOffsetMiliseconds: OB.Utilities.Date.getUTCOffsetInMiliseconds() - }, lcriteria, this.getFetchRequestParams()); + }, lcriteria, this.getFetchRequestParams(null, isExporting)); if (this.getSortField()) { sortCriteria = this.getSort(); if (sortCriteria && sortCriteria.length > 0) { diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/grid/ob-view-grid.js @@ -964,12 +964,19 @@ showField: function (field, suppressRelayout) { var res; + // Do not allow to add a new field while the grid is being edited. Adding a new field implies a grid refresh, + // and the refresh toolbar button is disabled while the grid/form is being edited + if (this.view.isEditingGrid) { + this.view.messageBar.setMessage(isc.OBMessageBar.TYPE_ERROR, OB.I18N.getLabel('OBUIAPP_Error'), OB.I18N.getLabel('OBUIAPP_NotAddingFieldsWhileGridEditing')); + return; + } this._showingField = true; this._savedEditValues = this.getEditValues(this.getEditRow()); res = this.Super('showField', arguments); delete this._savedEditValues; delete this._showingField; this.view.standardWindow.storeViewState(); + this.invalidateCache(); this.refreshContents(); return res; }, @@ -1943,7 +1950,8 @@ requestProperties.params = this.getFetchRequestParams(requestProperties.params); }, - getFetchRequestParams: function (params) { + getFetchRequestParams: function (params, isExporting) { + var i, len, first, selectedProperties; params = params || {}; if (this.targetRecordId) { @@ -1987,6 +1995,29 @@ } else { params[OB.Constants.WHERE_PARAMETER] = null; } + + if (!isExporting) { + first = true; + selectedProperties = ''; + len = this.requiredGridProperties.length; + for (i = 0; i < len; i++) { + if (first) { + first = false; + selectedProperties = selectedProperties + this.requiredGridProperties[i]; + } else { + selectedProperties = selectedProperties + ',' + this.requiredGridProperties[i]; + } + } + + len = this.fields.length; + for (i = 0; i < len; i++) { + if (this.fields[i].name[0] !== '_') { + selectedProperties = selectedProperties + ','; + selectedProperties = selectedProperties + this.fields[i].name; + } + } + params._selectedProperties = selectedProperties; + } return params; }, @@ -3489,19 +3520,50 @@ }, getFieldFromColumnName: function (columnName) { - var i, field, length, fields = this.completeFields; + var i, field, length, fields = this.view.propertyToColumns; length = fields.length; for (i = 0; i < fields.length; i++) { - if (fields[i].columnName === columnName) { + if (fields[i].dbColumn === columnName) { field = fields[i]; break; } } return field; + }, + + processColumnValue: function (rowNum, columnName, columnValue) { + var field, newValue; + if (!columnValue) { + return; + } + field = this.getFieldFromColumnName(columnName); + if (!field) { + return; + } + newValue = {}; + newValue[field.property] = columnValue.value; + this.setEditValue(rowNum, field.property, columnValue.value); + }, + + processFICReturn: function (response, data, request) { + var context = response && response.clientContext, + rowNum = context && context.rowNum, + grid = context && context.grid, + columnValues, prop, value, undef; + + if (rowNum === undef || !data || !data.columnValues) { + return; + } + columnValues = data.columnValues; + + for (prop in columnValues) { + if (columnValues.hasOwnProperty(prop)) { + grid.processColumnValue(rowNum, prop, columnValues[prop]); + } + } } - }); // = OBGridToolStripIcon = diff --git a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js --- a/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js +++ b/modules/org.openbravo.client.application/web/org.openbravo.client.application/js/main/ob-standard-view.js @@ -2138,6 +2138,7 @@ }, setContextInfo: function (sessionProperties, callbackFunction, forced) { + var newCallback, me = this; // no need to set the context in this case if (!forced && (this.isEditingGrid || this.isShowingForm)) { if (callbackFunction) { @@ -2150,12 +2151,23 @@ sessionProperties = this.getContextInfo(true, true, false, true); } + newCallback = function (response, data, request) { + var context = {}, grid = me.viewGrid; + context.rowNum = grid.getRecordIndex(grid.getSelectedRecord()); + context.grid = grid; + response.clientContext = context; + grid.processFICReturn (response, data, request); + if (callbackFunction) { + callbackFunction(); + } + }; + OB.RemoteCallManager.call('org.openbravo.client.application.window.FormInitializationComponent', sessionProperties, { - MODE: 'SETSESSION', + MODE: 'EDIT', TAB_ID: this.tabId, PARENT_ID: this.getParentId(), ROW_ID: this.viewGrid.getSelectedRecord() ? this.viewGrid.getSelectedRecord().id : this.getCurrentValues().id - }, callbackFunction); + }, newCallback); },