svn commit: r1381559 - in /ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model: ModelEntity.java ModelField.java

[jleroux]

Author: jleroux
Date: Thu Sep  6 11:24:01 2012
New Revision: 1381559

URL: http://svn.apache.org/viewvc?rev=1381559&view=rev
Log:
A patch from Chatree Srichart  for "Fields in extended entity do not override 
attribute enable-audit-log" https://issues.apache.org/jira/browse/OFBIZ-4844

Tested with NoteData.noteParty

Modified:
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
    ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java

Modified: 
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java?rev=1381559&r1=1381558&r2=1381559&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java 
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelEntity.java 
Thu Sep  6 11:24:01 2012
@@ -346,6 +346,9 @@ public class ModelEntity extends ModelIn
                     if (UtilValidate.isNotEmpty(field.getDescription())) {
                         existingField.setDescription(field.getDescription());
                     }
+                    if (UtilValidate.isNotEmpty(field.getEnableAuditLog())) {
+                        
existingField.setEnableAuditLog(field.getEnableAuditLog());
+                    }
                 } else {
                     // add to the entity as a new field
                     field.setModelEntity(this);

Modified: 
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java?rev=1381559&r1=1381558&r2=1381559&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java 
(original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/model/ModelField.java Thu 
Sep  6 11:24:01 2012
@@ -179,6 +179,10 @@ public class ModelField extends ModelChi
     public boolean getEnableAuditLog() {
         return this.enableAuditLog;
     }
+    
+    public void setEnableAuditLog(boolean enableAuditLog) {
+        this.enableAuditLog = enableAuditLog;
+    }
 
     public boolean getIsAutoCreatedInternal() {
         return this.isAutoCreatedInternal;