From df1b5ca91dadde99848c312c21ca90682d4dedd5 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 3 Dec 2010 19:58:23 +0000
Subject: [PATCH] =?UTF-8?q?Kleinere=20Erg=C3=A4nzungen:=20-=20Feld=20f?=
 =?UTF-8?q?=C3=BCr=20Funding=20im=20Formular=20f=C3=BCr=20die=20Projektbes?=
 =?UTF-8?q?chreibung=20verkleinert=20-=20Jetzt=20unn=C3=B6tige=20Eigenscha?=
 =?UTF-8?q?ften=20aus=20Traversal-Adaptern=20entfernt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: https://svn.libreccm.org/ccm/trunk@642 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/cms/contenttypes/SciDepartment.xml       | 7 +++++--
 .../com/arsdigita/cms/contenttypes/SciProject.xml          | 7 +++++--
 .../cms/contenttypes/ui/SciProjectDescriptionEditForm.java | 3 +--
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciDepartment.xml b/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciDepartment.xml
index 69c016803..618b776be 100644
--- a/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciDepartment.xml
+++ b/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciDepartment.xml
@@ -9,7 +9,10 @@
   -->
     <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
         <xrd:adapter objectType="com.arsdigita.cms.contenttypes.SciDepartment" extends="com.arsdigita.cms.ContentPage">
-            <xrd:associations rule="include">
+         <xrd:attributes rule="exclude">
+	    <xrd:property name="/object/departmentDescription"/>
+	  </xrd:attributes>
+        <!--<xrd:associations rule="include">
                 <xrd:property name="/object/addendum"/>
                 <xrd:property name="/object/contacts"/>
                 <xrd:property name="/object/contacts/person"/>
@@ -26,7 +29,7 @@
                 <xrd:property name="/object/persons/contacts"/>
                 <xrd:property name="/object/persons/contacts/address"/>
                 <xrd:property name="/object/persons/contacts/contactentries"/>		
-            </xrd:associations>
+            </xrd:associations>-->
         </xrd:adapter>
     </xrd:context>
 </xrd:adapters>
\ No newline at end of file
diff --git a/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml b/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
index 2d2d337a5..cba8177a7 100644
--- a/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
+++ b/ccm-sci-types-organization/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/SciProject.xml
@@ -9,11 +9,14 @@
   -->
     <xrd:context name="com.arsdigita.cms.dispatcher.SimpleXMLGenerator">
         <xrd:adapter objectType="com.arsdigita.cms.contenttypes.SciProject" extends="com.arsdigita.cms.ContentPage">
-            <xrd:associations rule="include">
+             <xrd:attributes rule="exclude">
+	    <xrd:property name="/object/projectDescription"/>
+	  </xrd:attributes>
+            <!--<xrd:associations rule="include">
                 <xrd:property name="/object/addendum"/>
                 <xrd:property name="/object/contacts"/>              
                 <xrd:property name="/object/persons"/>		
-            </xrd:associations>
+            </xrd:associations>-->
         </xrd:adapter>
     </xrd:context>
 </xrd:adapters>
\ No newline at end of file
diff --git a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectDescriptionEditForm.java b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectDescriptionEditForm.java
index 660a562ba..477a79a9c 100644
--- a/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectDescriptionEditForm.java
+++ b/ccm-sci-types-organization/src/com/arsdigita/cms/contenttypes/ui/SciProjectDescriptionEditForm.java
@@ -64,7 +64,6 @@ public class SciProjectDescriptionEditForm
         desc.setRows(25);
         add(desc);
 
-
         if (!SciProject.getConfig().getProjectFundingHide()) {
             add(new Label(SciOrganizationGlobalizationUtil.globalize(
                     "sciorganization.ui.project.funding")));
@@ -77,7 +76,7 @@ public class SciProjectDescriptionEditForm
                 funding = new TextArea(fundingParam);
             }
             funding.setCols(75);
-            funding.setRows(25);
+            funding.setRows(8);
             add(funding);
         }
     }