ccm-sci-types-organization ist jetzt völlig unabhängig von ccm-sci-publications

git-svn-id: https://svn.libreccm.org/ccm/trunk@583 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2010-10-19 13:15:48 +00:00
parent fb221bc4c1
commit 432acb6c36
2 changed files with 8 additions and 3 deletions

View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<registry>
<!-- nothing yet -->
<config class="com.arsdigita.cms.contenttypes.SciOrganizationConfig"
storage="ccm-sci-types-organization/SciOrganization.properties"/>
</registry>

View File

@ -22,6 +22,7 @@ package com.arsdigita.cms.contenttypes.ui;
import com.arsdigita.bebop.Component;
import com.arsdigita.bebop.Label;
import com.arsdigita.cms.ContentType;
import com.arsdigita.cms.ContentTypeCollection;
import com.arsdigita.cms.ItemSelectionModel;
import com.arsdigita.cms.contenttypes.SciOrganizationConfig;
import com.arsdigita.cms.contenttypes.SciProject;
@ -137,9 +138,12 @@ public class SciProjectPropertiesStep
"sciorganization.ui.project.departments"));
}
ContentTypeCollection contentTypes = ContentType.getAllContentTypes();
contentTypes.addFilter("associatedObjectType = :type").set(
"type",
"com.arsdigita.cms.contenttypes.Publication");
if ((!config.getProjectMaterialsHide())
&& ContentType.findByAssociatedObjectType(
"com.arsdigita.cms.contenttypes.Publication") != null) {
&& (contentTypes.size() > 0)) {
/*
* Must add this step manually since the basic class is not
* SimpleEditStep...