BugFix für ContentTypeHelperImpl: Die Descendants eines Content-Types wurden nicht korrekt eingetragen.
git-svn-id: https://svn.libreccm.org/ccm/trunk@1458 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
e0dd1dd7f3
commit
83926267ac
|
|
@ -384,8 +384,8 @@ public class ContentTypeHelperImpl implements ContentTypeHelper {
|
||||||
|| (parent.getAncestors() != null
|
|| (parent.getAncestors() != null
|
||||||
&& ct.getAncestors() != null
|
&& ct.getAncestors() != null
|
||||||
&& parent.getAncestors().length() < ct.getAncestors().
|
&& parent.getAncestors().length() < ct.getAncestors().
|
||||||
length())
|
length()))) {
|
||||||
|| !(parent.getClassName().equals(ct.getClassName())))) {
|
//|| !(parent.getClassName().equals(ct.getClassName())))) {
|
||||||
//System.out.printf("Setting parent to '%s'...\n",
|
//System.out.printf("Setting parent to '%s'...\n",
|
||||||
//ct.getClassName());
|
//ct.getClassName());
|
||||||
parent = ct;
|
parent = ct;
|
||||||
|
|
@ -431,12 +431,12 @@ public class ContentTypeHelperImpl implements ContentTypeHelper {
|
||||||
// Add this to parent descendants
|
// Add this to parent descendants
|
||||||
// //System.out.printf("Adding '%s' to descendants of parent '%s'...\n",
|
// //System.out.printf("Adding '%s' to descendants of parent '%s'...\n",
|
||||||
// type.getClassName(), parent.getClassName());
|
// type.getClassName(), parent.getClassName());
|
||||||
// parent.addDescendants(type.getID());
|
parent.addDescendants(type.getID());
|
||||||
for(ContentType p: parents) {
|
/*for(ContentType p: parents) {
|
||||||
parent.addDescendants(type.getID());
|
parent.addDescendants(type.getID());
|
||||||
//System.out.printf("Adding '%s' to descendants of parent '%s'...\n",
|
//System.out.printf("Adding '%s' to descendants of parent '%s'...\n",
|
||||||
// type.getClassName(), p.getClassName());
|
// type.getClassName(), p.getClassName());
|
||||||
}
|
}*/
|
||||||
}
|
}
|
||||||
//System.out.printf("Finished create pedigree for content type '%s'.\n\n",
|
//System.out.printf("Finished create pedigree for content type '%s'.\n\n",
|
||||||
// type.getClassName());
|
// type.getClassName());
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue