LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Weiterer Fix für GenericOrgaUnitTabComponent 

git-svn-id: https://svn.libreccm.org/ccm/trunk@1288 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2011-11-21 20:48:18 +00:00
parent a90aae7cda
commit ca4cf0dc6f
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ccm-sci-bundle/src/com/arsdigita/bundle/ui/GenericOrgaUnitTabComponent.java
View File

@ -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;
}
}