From 432acb6c366b0352b52c13bee67fa19b57952d96 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 19 Oct 2010 13:15:48 +0000
Subject: [PATCH] =?UTF-8?q?ccm-sci-types-organization=20ist=20jetzt=20v?=
 =?UTF-8?q?=C3=B6llig=20unabh=C3=A4ngig=20von=20ccm-sci-publications?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@583 8810af33-2d31-482b-a856-94f89814c4df
---
 .../src/ccm-cms-types-organization.config                 | 3 ++-
 .../cms/contenttypes/ui/SciProjectPropertiesStep.java     | 8 ++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ccm-cms-types-organization/src/ccm-cms-types-organization.config b/ccm-cms-types-organization/src/ccm-cms-types-organization.config
index adfdba100..ae3b34f20 100755
--- a/ccm-cms-types-organization/src/ccm-cms-types-organization.config
+++ b/ccm-cms-types-organization/src/ccm-cms-types-organization.config
@@ -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>
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
index ceab14099..dfac5b1ea 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectPropertiesStep.java
@@ -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...