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-94f89814c4dfmaster
parent
fb221bc4c1
commit
432acb6c36
|
|
@ -1,4 +1,5 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<registry>
|
<registry>
|
||||||
<!-- nothing yet -->
|
<config class="com.arsdigita.cms.contenttypes.SciOrganizationConfig"
|
||||||
|
storage="ccm-sci-types-organization/SciOrganization.properties"/>
|
||||||
</registry>
|
</registry>
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ package com.arsdigita.cms.contenttypes.ui;
|
||||||
import com.arsdigita.bebop.Component;
|
import com.arsdigita.bebop.Component;
|
||||||
import com.arsdigita.bebop.Label;
|
import com.arsdigita.bebop.Label;
|
||||||
import com.arsdigita.cms.ContentType;
|
import com.arsdigita.cms.ContentType;
|
||||||
|
import com.arsdigita.cms.ContentTypeCollection;
|
||||||
import com.arsdigita.cms.ItemSelectionModel;
|
import com.arsdigita.cms.ItemSelectionModel;
|
||||||
import com.arsdigita.cms.contenttypes.SciOrganizationConfig;
|
import com.arsdigita.cms.contenttypes.SciOrganizationConfig;
|
||||||
import com.arsdigita.cms.contenttypes.SciProject;
|
import com.arsdigita.cms.contenttypes.SciProject;
|
||||||
|
|
@ -137,9 +138,12 @@ public class SciProjectPropertiesStep
|
||||||
"sciorganization.ui.project.departments"));
|
"sciorganization.ui.project.departments"));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ContentTypeCollection contentTypes = ContentType.getAllContentTypes();
|
||||||
|
contentTypes.addFilter("associatedObjectType = :type").set(
|
||||||
|
"type",
|
||||||
|
"com.arsdigita.cms.contenttypes.Publication");
|
||||||
if ((!config.getProjectMaterialsHide())
|
if ((!config.getProjectMaterialsHide())
|
||||||
&& ContentType.findByAssociatedObjectType(
|
&& (contentTypes.size() > 0)) {
|
||||||
"com.arsdigita.cms.contenttypes.Publication") != null) {
|
|
||||||
/*
|
/*
|
||||||
* Must add this step manually since the basic class is not
|
* Must add this step manually since the basic class is not
|
||||||
* SimpleEditStep...
|
* SimpleEditStep...
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue