From 6152ff491e39aa4ccac86b735fdc8c47dacddca0 Mon Sep 17 00:00:00 2001
From: quasi <quasi@8810af33-2d31-482b-a856-94f89814c4df>
Date: Fri, 9 Dec 2011 09:08:20 +0000
Subject: [PATCH] CT Event

Eingabe von Leadtext und Starttime optional gemacht

git-svn-id: https://svn.libreccm.org/ccm/trunk@1325 8810af33-2d31-482b-a856-94f89814c4df
---
 .../cms/contenttypes/EventConfig.java         | 20 +++++++++++++++++++
 .../EventConfig_parameter.properties          |  9 +++++++++
 .../contenttypes/ui/EventPropertyForm.java    |  9 ++++++---
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java
index 48c427e9c..ee34324e2 100755
--- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java
+++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java
@@ -35,6 +35,8 @@ public class EventConfig extends AbstractConfig {
     private final Parameter m_useHtmlDateDescription;
     private final Parameter m_startYear;
     private final Parameter m_endYearDelta;
+    private final Parameter m_leadTextOptional;
+    private final Parameter m_startTimeOptional;
     
     public EventConfig() {
         m_hideDateDescription = new BooleanParameter(
@@ -77,6 +79,16 @@ public class EventConfig extends AbstractConfig {
                 Parameter.REQUIRED,
                 new Integer(3));
         
+        m_leadTextOptional = new BooleanParameter(
+                "com.arsdigita.cms.contenttypes.event.lead_text_optional",
+                Parameter.REQUIRED,
+                new Boolean(false));
+        
+        m_startTimeOptional = new BooleanParameter(
+                "com.arsdigita.cms.contenttypes.event.start_time_optional",
+                Parameter.REQUIRED,
+                new Boolean(false));
+        
         register(m_hideDateDescription);
         register(m_hideMainContributor);
         register(m_hideEventType);
@@ -85,6 +97,8 @@ public class EventConfig extends AbstractConfig {
         register(m_useHtmlDateDescription);
         register(m_startYear);
         register(m_endYearDelta);
+        register(m_leadTextOptional);
+        register(m_startTimeOptional);
         
         loadInfo();
     }
@@ -113,5 +127,11 @@ public class EventConfig extends AbstractConfig {
     public final int getEndYearDelta() {
         return ((Integer) get(m_endYearDelta)).intValue();
     }
+    public final boolean isLeadTextOptional() {
+        return ((Boolean) get(m_leadTextOptional)).booleanValue();
+    }
+    public final boolean isStartTimeOptional() {
+        return ((Boolean) get(m_startTimeOptional)).booleanValue();
+    }
 }
 
diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties
index 0cad1d464..07ccbc280 100755
--- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties
+++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties
@@ -38,3 +38,12 @@ com.arsdigita.cms.contenttypes.event.end_year_delta.purpose=End year delta for t
 com.arsdigita.cms.contenttypes.event.end_year_delta.example=3
 com.arsdigita.cms.contenttypes.event.end_year_delta.format=[integer]
 
+com.arsdigita.cms.contenttypes.event.lead_text_optional.title=Make lead text optional
+com.arsdigita.cms.contenttypes.event.lead_text_optional.purpose=Make the lead text of an event optional
+com.arsdigita.cms.contenttypes.event.lead_text_optional.example=false|true
+com.arsdigita.cms.contenttypes.event.lead_text_optional.format=[boolean]
+
+com.arsdigita.cms.contenttypes.event.start_time_optional.title=Make start time text optional
+com.arsdigita.cms.contenttypes.event.start_time_optional.purpose=Make the start time of an event optional
+com.arsdigita.cms.contenttypes.event.start_time_optional.example=false|true
+com.arsdigita.cms.contenttypes.event.start_time_optional.format=[boolean]
diff --git a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java
index 3e9792bf7..5085db783 100755
--- a/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java
+++ b/ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java
@@ -115,8 +115,9 @@ public class EventPropertyForm extends BasicPageForm
         /* Summary (lead) */
         add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.lead").localize()));
         ParameterModel leadParam = new StringParameter(LEAD);
-        //leadParam
-        //    .addParameterListener(new NotNullValidationListener());
+        if(Event.getConfig().isLeadTextOptional()) {
+            leadParam.addParameterListener(new NotNullValidationListener());
+        }
         TextArea lead = new TextArea(leadParam);
         lead.setCols(50);
         lead.setRows(5);
@@ -134,7 +135,9 @@ public class EventPropertyForm extends BasicPageForm
 
         ParameterModel eventStartTimeParam = new TimeParameter(START_TIME);
         add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.start_time").localize()));
-        eventStartTimeParam.addParameterListener(new NotNullValidationListener());
+        if(Event.getConfig().isStartTimeOptional()) {
+            eventStartTimeParam.addParameterListener(new NotNullValidationListener());
+        }
         Time startTime = new Time(eventStartTimeParam);
         add(startTime);