From fec244eb00508517cd3313f6cf55973c2d2e99cf Mon Sep 17 00:00:00 2001 From: Ivan Kohler Date: Thu, 7 Jun 2012 17:20:16 -0700 Subject: merge RTx-Calendar 0.14 --- rt/share/html/Elements/CalendarEvent | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'rt/share/html/Elements') diff --git a/rt/share/html/Elements/CalendarEvent b/rt/share/html/Elements/CalendarEvent index 3a6b00bb8..65dd58c9f 100644 --- a/rt/share/html/Elements/CalendarEvent +++ b/rt/share/html/Elements/CalendarEvent @@ -13,11 +13,11 @@ $DateTypes => undef % and RTx::Calendar::LocalDate($Object->ResolvedObj->Unix) eq $today) { -% } elsif ($DateTypes->{Starts} and $DateTypes->{Due} +% } elsif ($DateTypes->{Starts} and $DateTypes->{Due} % and RTx::Calendar::LocalDate($Object->StartsObj->Unix) eq $today and RTx::Calendar::LocalDate($Object->DueObj->Unix) eq $today ) { -% } elsif ($DateTypes->{Due} and $DateTypes->{Created} +% } elsif ($DateTypes->{Due} and $DateTypes->{Created} % and RTx::Calendar::LocalDate($Object->DueObj->Unix) eq $today and RTx::Calendar::LocalDate($Object->CreatedObj->Unix) eq $today ) { @@ -25,7 +25,7 @@ $DateTypes => undef % and RTx::Calendar::LocalDate($Object->StartsObj->Unix) eq $today) { -% } elsif ($DateTypes->{Due} +% } elsif ($DateTypes->{Due} % and RTx::Calendar::LocalDate($Object->DueObj->Unix) eq $today) { @@ -64,7 +64,7 @@ $DateTypes => undef % my $method = '$Object->'.$attr.'()'; % $method =~ s/->ISO\(\)$/->ISO( Timezone => 'user' )/; % $value = eval $method; -% if ($@) {die "Check your CalendarPopupFields config in etc/RT_SiteConfig.pm.

Failed to find \"$attr\" - ". $@}; +% if ($@) {die "Check your CalendarPopupFields config in etc/RT_SiteConfig.pm.

Failed to find \"$attr\" - ". $@}; % } <&|/l&><% $label_of{$attr} %>: <% $value %>
% } -- cgit v1.2.1