LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

CT Event 

Eingabe von Leadtext und Starttime optional gemacht

git-svn-id: https://svn.libreccm.org/ccm/trunk@1325 8810af33-2d31-482b-a856-94f89814c4df
master
quasi 2011-12-09 09:08:20 +00:00
parent 80a6dcc592
commit 6152ff491e
3 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig.java
View File

@ -35,6 +35,8 @@ public class EventConfig extends AbstractConfig {
private final Parameter m_useHtmlDateDescription; private final Parameter m_useHtmlDateDescription;
private final Parameter m_startYear; private final Parameter m_startYear;
private final Parameter m_endYearDelta; private final Parameter m_endYearDelta;
private final Parameter m_leadTextOptional;
private final Parameter m_startTimeOptional;
public EventConfig() { public EventConfig() {
m_hideDateDescription = new BooleanParameter( m_hideDateDescription = new BooleanParameter(
@ -77,6 +79,16 @@ public class EventConfig extends AbstractConfig {
Parameter.REQUIRED, Parameter.REQUIRED,
new Integer(3)); 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_hideDateDescription);
register(m_hideMainContributor); register(m_hideMainContributor);
register(m_hideEventType); register(m_hideEventType);
@ -85,6 +97,8 @@ public class EventConfig extends AbstractConfig {
register(m_useHtmlDateDescription); register(m_useHtmlDateDescription);
register(m_startYear); register(m_startYear);
register(m_endYearDelta); register(m_endYearDelta);
register(m_leadTextOptional);
register(m_startTimeOptional);
loadInfo(); loadInfo();
} }
@ -113,5 +127,11 @@ public class EventConfig extends AbstractConfig {
public final int getEndYearDelta() { public final int getEndYearDelta() {
return ((Integer) get(m_endYearDelta)).intValue(); 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();
}
} }

9
ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/EventConfig_parameter.properties
View File

@ -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.example=3
com.arsdigita.cms.contenttypes.event.end_year_delta.format=[integer] 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]

7
ccm-cms-types-event/src/com/arsdigita/cms/contenttypes/ui/EventPropertyForm.java
View File

@ -115,8 +115,9 @@ public class EventPropertyForm extends BasicPageForm
/* Summary (lead) */ /* Summary (lead) */
add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.lead").localize())); add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.lead").localize()));
ParameterModel leadParam = new StringParameter(LEAD); ParameterModel leadParam = new StringParameter(LEAD);
//leadParam if(Event.getConfig().isLeadTextOptional()) {
// .addParameterListener(new NotNullValidationListener()); leadParam.addParameterListener(new NotNullValidationListener());
}
TextArea lead = new TextArea(leadParam); TextArea lead = new TextArea(leadParam);
lead.setCols(50); lead.setCols(50);
lead.setRows(5); lead.setRows(5);
@ -134,7 +135,9 @@ public class EventPropertyForm extends BasicPageForm
ParameterModel eventStartTimeParam = new TimeParameter(START_TIME); ParameterModel eventStartTimeParam = new TimeParameter(START_TIME);
add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.start_time").localize())); add(new Label((String) EventGlobalizationUtil.globalize("cms.contenttypes.ui.event.start_time").localize()));
if(Event.getConfig().isStartTimeOptional()) {
eventStartTimeParam.addParameterListener(new NotNullValidationListener()); eventStartTimeParam.addParameterListener(new NotNullValidationListener());
}
Time startTime = new Time(eventStartTimeParam); Time startTime = new Time(eventStartTimeParam);
add(startTime); add(startTime);