details: https://code.openbravo.com/erp/devel/pi/rev/f2c99aeb7f18
changeset: 14028:f2c99aeb7f18
user: Antonio Moreno <antonio.moreno <at> openbravo.com>
date: Wed Oct 19 12:46:38 2011 +0200
summary: Fixed issue 18735. Audit info column names will be exported
correctly to CSV
diffstat:
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
| 22 +++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diffs (46 lines):
diff -r 3c876af94b65 -r f2c99aeb7f18
modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
---
a/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Wed Oct 19 12:32:43 2011 +0200
+++
b/modules/org.openbravo.service.datasource/src/org/openbravo/service/datasource/DataSourceServlet.java
Wed Oct 19 12:46:38 2011 +0200
@@ -52,6 +52,7 @@
import org.openbravo.base.model.domaintype.EnumerateDomainType;
import org.openbravo.base.secureApp.VariablesSecureApp;
import org.openbravo.base.session.OBPropertiesProvider;
+import org.openbravo.client.application.window.OBViewUtil;
import org.openbravo.client.kernel.BaseKernelServlet;
import org.openbravo.client.kernel.KernelUtils;
import org.openbravo.client.kernel.OBUserException;
@@ -68,6 +69,7 @@
import org.openbravo.erpCommon.utility.PropertyNotFoundException;
import org.openbravo.erpCommon.utility.Utility;
import org.openbravo.model.ad.datamodel.Column;
+import org.openbravo.model.ad.ui.Element;
import org.openbravo.model.ad.ui.Field;
import org.openbravo.model.ad.ui.FieldTrl;
import org.openbravo.model.ad.ui.Tab;
@@ -326,7 +328,25 @@
continue;
}
Column col = OBDal.getInstance().get(Column.class,
prop.getColumnId());
- if (parameters.get("tab") != null &&
!parameters.get("tab").equals("")) {
+
+ if (prop.isAuditInfo()) {
+ Element element = null;
+ if ("creationDate".equals(prop.getName())) {
+ element = OBViewUtil.createdElement;
+ } else if ("createdBy".equals(prop.getName())) {
+ element = OBViewUtil.createdByElement;
+ } else if ("updated".equals(prop.getName())) {
+ element = OBViewUtil.updatedElement;
+ } else if ("updatedBy".equals(prop.getName())) {
+ element = OBViewUtil.updatedByElement;
+ }
+ if (element != null) {
+ niceFieldProperties.put(prop.getName(),
+ OBViewUtil.getLabel(element,
element.getADElementTrlList()));
+ } else {
+ niceFieldProperties.put(prop.getName(), col.getName());
+ }
+ } else if (parameters.get("tab") != null &&
!parameters.get("tab").equals("")) {
Tab tab = OBDal.getInstance().get(Tab.class,
parameters.get("tab"));
for (Field field : tab.getADFieldList()) {
if (!field.getColumn().getId().equals(col.getId())) {
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2d-oct
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits
