From 86df63062dea3a65449ccec439412d33a42f0707 Mon Sep 17 00:00:00 2001 From: quasi Date: Mon, 29 Jul 2013 11:11:01 +0000 Subject: [PATCH] ContentItemPage: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Hinzugefügt: * Ausgabe des Contenttypes (siehe Ticket #1683) git-svn-id: https://svn.libreccm.org/ccm/trunk@2276 8810af33-2d31-482b-a856-94f89814c4df --- .../com/arsdigita/cms/ui/ContentItemPage.java | 33 ++++++++++++++----- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java index c1f2e467d..d5675adcb 100755 --- a/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java +++ b/ccm-cms/src/com/arsdigita/cms/ui/ContentItemPage.java @@ -56,6 +56,8 @@ import com.arsdigita.kernel.ui.ACSObjectSelectionModel; import com.arsdigita.persistence.OID; import com.arsdigita.ui.DebugPanel; import com.arsdigita.util.Assert; +import com.arsdigita.xml.Document; +import com.arsdigita.xml.Element; import java.io.IOException; import java.math.BigDecimal; import javax.servlet.http.HttpServletRequest; @@ -241,12 +243,12 @@ public class ContentItemPage extends CMSPage implements ActionListener { // Build the preview link. m_previewLink = new Link(new Label(gz("cms.ui.preview")), new PrintListener() { - public final void prepare(final PrintEvent e) { - final Link link = (Link) e.getTarget(); - link.setTarget(getPreviewURL(e.getPageState())); - link.setTargetFrame(Link.NEW_FRAME); - } - }); + public final void prepare(final PrintEvent e) { + final Link link = (Link) e.getTarget(); + link.setTarget(getPreviewURL(e.getPageState())); + link.setTargetFrame(Link.NEW_FRAME); + } + }); m_previewLink.setIdAttr("preview_link"); add(m_previewLink); @@ -405,8 +407,8 @@ public class ContentItemPage extends CMSPage implements ActionListener { } /** - * @deprecated Use getItemURL instead - */ + * @deprecated Use getItemURL instead + */ public static String getRelativeItemURL(BigDecimal itemId, int tab) { StringBuffer url = new StringBuffer(); url.append(PageLocations.ITEM_PAGE).append("?").append(ITEM_ID).append("=").append(itemId. @@ -524,4 +526,19 @@ public class ContentItemPage extends CMSPage implements ActionListener { protected WizardSelector getWizardPane() { return m_wizardPane; } + + /** + * Adds the content type to the output. + * + * @param state PageState + * @param parent Parent document + * @return page + */ + protected Element generateXMLHelper(PageState state, Document parent) { + Element page = super.generateXMLHelper(state, parent); + Element contenttype = page.newChildElement("bebop:contentType", BEBOP_XML_NS); + contenttype.setText(m_item.getContentItem(state).getContentType().getLabel()); + + return page; + } }