The end date is being overridden when the date is being provided by another field or a token.

Line 105 in addtocalendar.build.inc will always override the end date regardless of whether it has already been set or not.

if (empty($end_date)) {
          $build['addtocalendar'][$index]['atc_date_end']['#value'] = (!empty($build['addtocalendar'][$index]['atc_date_end']['#value'])) ? $build['addtocalendar'][$index]['atc_date_end']['#value'] : $build['addtocalendar'][$index]['atc_date_start']['#value'];
          $build['addtocalendar'][$index]['atc_date_end']['#value'] = (!empty($build['addtocalendar'][$index]['atc_date_end']['#value'])) ? $build['addtocalendar'][$index]['atc_date_start']['#value'] : $date->format('Y-m-d H:i:s', ['timezone' => $timeZone]);
        }
CommentFileSizeAuthor
#9 end_date_overridden_if-2894914-9.patch1.85 KBgg24
#2 2894914-end_date_overridden_2.patch1.03 KBsawtell

Comments

ls206 created an issue. See original summary.

sawtell’s picture

sawtell commented
StatusFileSize
new 2894914-end_date_overridden_2.patch1.03 KB

Patch added

geovanni.conti’s picture

geovanni.conti commented
Status: Active » Needs review

Hi.

I get into the same problem and same solution that you.

Your patch worked for me, thanks

faline’s picture

faline commented
Status: Needs review » Reviewed & tested by the community

We tested this in our project and the patch works fine for us.

Thanks!

gg24’s picture

gg24 commented
Assigned: Unassigned » gg24

  • gg24 committed 521bc48 on 8.x-2.x authored by ls206 
    Issue #2894914 by ls206, geovanni.conti, faline, gg24: End date...
gg24’s picture

gg24 commented
Assigned: gg24 » Unassigned
Status: Reviewed & tested by the community » Fixed

Thanks everyone for the efforts.

gg24’s picture

gg24 commented
Assigned: Unassigned » gg24
Status: Fixed » Active

Opening this back as it messed up with timezone.

gg24’s picture

gg24 commented
Assigned: gg24 » Unassigned
Status: Active » Needs review
StatusFileSize
new end_date_overridden_if-2894914-9.patch1.85 KB

Adding a patch. Please review.

Thanks!

  • gg24 committed bd316d3 on 8.x-2.x 
    Issue #2894914 by gg24, ls206, geovanni.conti, faline: End date...
gg24’s picture

gg24 commented
Status: Needs review » Fixed

Fixed.

Thanks everyone for your efforts.

othermachines’s picture

othermachines commented

Unfortunately the last patch overrides the value with the start date again.

This works for me:

if (empty($end_date)) {
  $end_date = $date;
  if (!empty($build['addtocalendar'][$index]['atc_date_end']['#value'])) {
    $end_date = new DrupalDateTime(preg_replace('/T/', ' ', $build['addtocalendar'][$index]['atc_date_end']['#value']), 'UTC');
  }
  $build['addtocalendar'][$index]['atc_date_end']['#value'] = $end_date->format('Y-m-d H:i:s', ['timezone' => $timeZone]);
}

Status: Fixed » Closed (fixed)

Automatically closed - issue fixed for 2 weeks with no activity.