[OpenbravoERP-commits] devel/pi: related to issue 40244: removed some duplicated code

[hg]

details:   https://code.openbravo.com/erp/devel/pi/rev/e654aac2941d
changeset: 35466:e654aac2941d
user:      Asier Lostalé <asier.lostale <at> openbravo.com>
date:      Fri Feb 22 09:25:44 2019 +0100
summary:   related to issue 40244: removed some duplicated code

  Property already has an isAuditInfo, there is no need to implement the same in
  OBInterceptor also.

diffstat:

 src/org/openbravo/dal/core/OBInterceptor.java |  15 +++++----------
 1 files changed, 5 insertions(+), 10 deletions(-)

diffs (37 lines):

diff -r 4e6fc07685e6 -r e654aac2941d 
src/org/openbravo/dal/core/OBInterceptor.java
--- a/src/org/openbravo/dal/core/OBInterceptor.java     Tue Mar 06 16:47:16 
2018 +0100
+++ b/src/org/openbravo/dal/core/OBInterceptor.java     Fri Feb 22 09:25:44 
2019 +0100
@@ -300,28 +300,23 @@
           continue;
         }
 
+        Property property = bob.getEntity().getProperty(propertyNames[i]);
         boolean skipCrossOrgCheck = (obContext.isInCrossOrgAdministratorMode()
-            && 
bob.getEntity().getProperty(propertyNames[i]).isAllowedCrossOrgReference())
-            || isAudit(propertyNames[i]);
+            && property.isAllowedCrossOrgReference()) || 
property.isAuditInfo();
 
         if (!skipCrossOrgCheck && !obObject.getEntity().isVirtualEntity()
             && 
!obContext.getOrganizationStructureProvider(o1.getClient().getId())
                 .isInNaturalTree(o1, o2)) {
           throw new OBSecurityException("Entity " + bob.getIdentifier() + " (" 
+ bob.getEntityName()
               + ") with organization " + o1.getIdentifier() + " references an 
entity "
-              + ((BaseOBObject) currentState[i]).getIdentifier() + " through 
its property "
-              + propertyNames[i] + " but this referenced entity" + " belongs 
to an organization "
-              + o2.getIdentifier() + " which is not part of the natural tree 
of "
-              + o1.getIdentifier());
+              + obObject.getIdentifier() + " through its property " + property
+              + " but this referenced entity" + " belongs to an organization " 
+ o2.getIdentifier()
+              + " which is not part of the natural tree of " + 
o1.getIdentifier());
         }
       }
     }
   }
 
-  private boolean isAudit(final String propertyName) {
-    return propertyName.equalsIgnoreCase("createdBy") || 
propertyName.equalsIgnoreCase("updatedBy");
-  }
-
   // general event handler does new and update
   protected void doEvent(Object object, Object[] currentState, String[] 
propertyNames) {
     try {


_______________________________________________
Openbravo-commits mailing list
Openbravo-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/openbravo-commits