Noch eine Typo gefunden und korrigiert
git-svn-id: https://svn.libreccm.org/ccm/trunk@712 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
ce727c4078
commit
efb5ac868a
|
|
@ -779,7 +779,7 @@ public class ContentSection extends Application {
|
||||||
return types;
|
return types;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContentTypeCollection getDecendantsOfContentType(ContentType ct) {
|
public ContentTypeCollection getDescendantsOfContentType(ContentType ct) {
|
||||||
ContentTypeCollection ctc = getContentTypes();
|
ContentTypeCollection ctc = getContentTypes();
|
||||||
|
|
||||||
// The Filter Factory
|
// The Filter Factory
|
||||||
|
|
@ -791,7 +791,7 @@ public class ContentSection extends Application {
|
||||||
// The content type must be either of the requested type
|
// The content type must be either of the requested type
|
||||||
or.addFilter(ff.equals(ContentType.ID, ct.ID));
|
or.addFilter(ff.equals(ContentType.ID, ct.ID));
|
||||||
|
|
||||||
// Or must be a decendant of the requested type
|
// Or must be a descendant of the requested type
|
||||||
try {
|
try {
|
||||||
StringTokenizer strTok = new StringTokenizer(ct.getDescendants(), "/");
|
StringTokenizer strTok = new StringTokenizer(ct.getDescendants(), "/");
|
||||||
while (strTok.hasMoreElements()) {
|
while (strTok.hasMoreElements()) {
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ public abstract class NewItemForm extends Form {
|
||||||
if (parentType == null) {
|
if (parentType == null) {
|
||||||
typesCollection = section.getCreatableContentTypes();
|
typesCollection = section.getCreatableContentTypes();
|
||||||
} else {
|
} else {
|
||||||
typesCollection = section.getDecendantsOfContentType(parentType);
|
typesCollection = section.getDescendantsOfContentType(parentType);
|
||||||
}
|
}
|
||||||
|
|
||||||
typesCollection.addOrder(ContentType.LABEL);
|
typesCollection.addOrder(ContentType.LABEL);
|
||||||
|
|
|
||||||
|
|
@ -56,7 +56,7 @@ public class ContentTypeFilterWidget extends FilterWidget {
|
||||||
}
|
}
|
||||||
|
|
||||||
public ContentTypeFilterWidget(ContentSection section, ContentType parentType) {
|
public ContentTypeFilterWidget(ContentSection section, ContentType parentType) {
|
||||||
this(section.getDecendantsOfContentType(parentType));
|
this(section.getDescendantsOfContentType(parentType));
|
||||||
m_section = section;
|
m_section = section;
|
||||||
m_parentType = parentType;
|
m_parentType = parentType;
|
||||||
}
|
}
|
||||||
|
|
@ -108,7 +108,7 @@ public class ContentTypeFilterWidget extends FilterWidget {
|
||||||
if (parentType == null) {
|
if (parentType == null) {
|
||||||
typesCollection = section.getContentTypes();
|
typesCollection = section.getContentTypes();
|
||||||
} else {
|
} else {
|
||||||
typesCollection = section.getDecendantsOfContentType(parentType);
|
typesCollection = section.getDescendantsOfContentType(parentType);
|
||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue