From ca4cf0dc6fe7122f55a965976b59d5d16e861b87 Mon Sep 17 00:00:00 2001 From: jensp Date: Mon, 21 Nov 2011 20:48:18 +0000 Subject: [PATCH] =?UTF-8?q?Weiterer=20Fix=20f=C3=BCr=20GenericOrgaUnitTabC?= =?UTF-8?q?omponent?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1288 8810af33-2d31-482b-a856-94f89814c4df --- .../bundle/ui/GenericOrgaUnitTabComponent.java | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java index 97dbff075..d17768fe5 100644 --- a/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java +++ b/ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java @@ -2,6 +2,7 @@ package com.arsdigita.bundle.ui; import com.arsdigita.bebop.Page; import com.arsdigita.bebop.PageState; +import com.arsdigita.cms.CMS; import com.arsdigita.cms.contenttypes.GenericOrganizationalUnit; import com.arsdigita.cms.contenttypes.ui.GenericOrgaUnitTab; import com.arsdigita.dispatcher.DispatcherHelper; @@ -59,18 +60,27 @@ public class GenericOrgaUnitTabComponent extends AbstractComponent { GenericOrganizationalUnit orgaunit = (GenericOrganizationalUnit) DomainObjectFactory. newInstance(orgaunitOid); - if ((DispatcherHelper.getDispatcherPrefix(request) == null) + if ((DispatcherHelper.getDispatcherPrefix(request) == null) || !DispatcherHelper.getDispatcherPrefix(request).equals("preview")) { orgaunit = (GenericOrganizationalUnit) orgaunit.getLiveVersion(); } - final Element tabsElem = new Element("orgaUnitTabs"); + final Element contentPanelElem = new Element("cms:contentPanel", + CMS.CMS_XML_NS); + final Element cmsItemElem = contentPanelElem.newChildElement("cms:item", CMS.CMS_XML_NS); + cmsItemElem.addAttribute("oid", orgaunitOid.toString()); + final Element objTypeElem = cmsItemElem.newChildElement("objectType"); + objTypeElem.setText(orgaunit.getClass().getName()); + + final Element tabsElem = + contentPanelElem.newChildElement("orgaUnitTabs");//new Element("orgaUnitTabs"); final Element selectedTabElem = tabsElem.newChildElement("selectedTab"); if (orgaunit != null) { tab.generateXml(orgaunit, selectedTabElem, state); } - return tabsElem; + //return tabsElem; + return contentPanelElem; } }