details: https://code.openbravo.com/erp/devel/pi/rev/a44439184a15
changeset: 15185:a44439184a15
user: Asier Lostalé <asier.lostale <at> openbravo.com>
date: Tue Jan 24 15:22:56 2012 +0100
summary: fixed bug 19359: Parent id shown as part of some identifiers
diffstat:
src/org/openbravo/base/model/Entity.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diffs (32 lines):
diff -r ab84b5bf2f33 -r a44439184a15 src/org/openbravo/base/model/Entity.java
--- a/src/org/openbravo/base/model/Entity.java Tue Jan 24 12:03:01 2012 +0100
+++ b/src/org/openbravo/base/model/Entity.java Tue Jan 24 15:22:56 2012 +0100
@@ -11,7 +11,7 @@
* under the License.
* The Original Code is Openbravo ERP.
* The Initial Developer of the Original Code is Openbravo SLU
- * All portions are Copyright (C) 2008-2011 Openbravo SLU
+ * All portions are Copyright (C) 2008-2012 Openbravo SLU
* All Rights Reserved.
* Contributor(s): ______________________________________.
************************************************************************
@@ -211,6 +211,19 @@
propertiesByColumnName.put(property.getColumnName().toLowerCase(),
property);
}
if (property.isIdentifier()) {
+ // In case of id properties that are part of a foreign key, the property
was already set as
+ // identifier. Remove it before adding current one.
+ Property duplicatedIdentifier = null;
+ for (Property i : identifierProperties) {
+ if (i.getColumnName().equalsIgnoreCase(property.getColumnName())) {
+ duplicatedIdentifier = i;
+ break;
+ }
+ }
+ if (duplicatedIdentifier != null) {
+ identifierProperties.remove(duplicatedIdentifier);
+ log.debug("Removed duplicated idenfitier property " + property);
+ }
getIdentifierProperties().add(property);
}
if (property.isId()) {
------------------------------------------------------------------------------
Keep Your Developer Skills Current with LearnDevNow!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-d2d
_______________________________________________
Openbravo-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/openbravo-commits