From 6ceadd40d64bbae8758cdefbdfe10b351dac1b4d Mon Sep 17 00:00:00 2001 From: quasi Date: Tue, 26 Jul 2011 09:15:40 +0000 Subject: [PATCH] =?UTF-8?q?M=C3=B6glichkeit=20schaffen,=20auch=20bei=20ein?= =?UTF-8?q?em=20IncompleteDateParameter=20ein=20gesetztes=20Datum=20wieder?= =?UTF-8?q?=20zu=20l=C3=B6schen.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1032 8810af33-2d31-482b-a856-94f89814c4df --- ccm-core/src/com/arsdigita/bebop/form/Date.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ccm-core/src/com/arsdigita/bebop/form/Date.java b/ccm-core/src/com/arsdigita/bebop/form/Date.java index 4b5e54b97..cf5df15bd 100755 --- a/ccm-core/src/com/arsdigita/bebop/form/Date.java +++ b/ccm-core/src/com/arsdigita/bebop/form/Date.java @@ -202,7 +202,12 @@ public class Date extends Widget implements BebopConstants { m_year.clearOptions(); if (this.getParameterModel() instanceof IncompleteDateParameter) { - if (((IncompleteDateParameter) this.getParameterModel()).isSkipYearAllowed()) { + // Create an empty year entry to unset a date, if either + // a) skipYearAllowed is true + // b) skipDayAllowed is true and skipMonthAllowed is true, to unset a date + if (((IncompleteDateParameter) this.getParameterModel()).isSkipYearAllowed() || + (((IncompleteDateParameter) this.getParameterModel()).isSkipDayAllowed() && + ((IncompleteDateParameter) this.getParameterModel()).isSkipMonthAllowed())) { m_year.addOption(new Option("", "")); } }