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

The year of the end date of new event item is now preset to the current year (Ticket #2070) 

git-svn-id: https://svn.libreccm.org/ccm/trunk@2640 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2014-05-22 13:50:24 +00:00
parent e34fd6ff68
commit 848125cbb5
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -298,14 +298,16 @@ public class EventPropertyForm extends BasicPageForm
// End date can be null
java.util.Date endDate = event.getEndDate();
if (endDate != null) {
m_endDate.addYear(endDate);
if (endDate == null) {
// new Date is initialised to current time
endDate = new java.util.Date();
}
m_endDate.addYear(endDate);
data.put(LEAD, event.getLead());
data.put(START_DATE, startDate);
data.put(START_TIME, event.getStartTime());
data.put(END_DATE, event.getEndDate());
data.put(END_DATE, endDate);
data.put(END_TIME, event.getEndTime());
if (!Event.getConfig().getHideDateDescription()) {
data.put(EVENT_DATE, event.getEventDate());