BugFix for InternetArticleExtraXMLGenerator, was producing wrong XML structure (Ticket #1715).
git-svn-id: https://svn.libreccm.org/ccm/trunk@2146 8810af33-2d31-482b-a856-94f89814c4dfmaster
parent
b405bba066
commit
f1a97b0f94
|
|
@ -18,7 +18,7 @@ import com.arsdigita.xml.Element;
|
||||||
public class InternetArticleExtraXmlGenerator implements ExtraXMLGenerator {
|
public class InternetArticleExtraXmlGenerator implements ExtraXMLGenerator {
|
||||||
|
|
||||||
private boolean listMode = false;
|
private boolean listMode = false;
|
||||||
|
|
||||||
public void generateXML(final ContentItem item,
|
public void generateXML(final ContentItem item,
|
||||||
final Element element,
|
final Element element,
|
||||||
final PageState state) {
|
final PageState state) {
|
||||||
|
|
@ -41,7 +41,7 @@ public class InternetArticleExtraXmlGenerator implements ExtraXMLGenerator {
|
||||||
public void setListMode(final boolean listMode) {
|
public void setListMode(final boolean listMode) {
|
||||||
this.listMode = true;
|
this.listMode = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createOrganizationXml(final InternetArticle internetArticle,
|
private void createOrganizationXml(final InternetArticle internetArticle,
|
||||||
final Element parent,
|
final Element parent,
|
||||||
final PageState state) {
|
final PageState state) {
|
||||||
|
|
@ -49,10 +49,10 @@ public class InternetArticleExtraXmlGenerator implements ExtraXMLGenerator {
|
||||||
internetArticle.getOrganization(GlobalizationHelper.
|
internetArticle.getOrganization(GlobalizationHelper.
|
||||||
getNegotiatedLocale().getLanguage());
|
getNegotiatedLocale().getLanguage());
|
||||||
if (orga != null) {
|
if (orga != null) {
|
||||||
final Element orgaElem = parent.newChildElement("organization");
|
|
||||||
final XmlGenerator generator = new XmlGenerator(orga);
|
final XmlGenerator generator = new XmlGenerator(orga);
|
||||||
|
generator.setItemElemName("organization", "");
|
||||||
generator.setListMode(listMode);
|
generator.setListMode(listMode);
|
||||||
generator.generateXML(state, orgaElem, "");
|
generator.generateXML(state, parent, "");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -69,5 +69,6 @@ public class InternetArticleExtraXmlGenerator implements ExtraXMLGenerator {
|
||||||
protected ContentItem getContentItem(final PageState state) {
|
protected ContentItem getContentItem(final PageState state) {
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue