зеркало из https://github.com/mozilla/pjs.git
Bug 369912: Buglists exported as iCalendar have wrong timestamps - Patch by Fr��d��ric Buclin <LpSolit@gmail.com> r=myk a=LpSolit
This commit is contained in:
Родитель
99e34d92ab
Коммит
b53d753119
|
@ -1018,13 +1018,13 @@ while (my @row = $buglist_sth->fetchrow_array()) {
|
|||
# Put in the change date as a time, so that the template date plugin
|
||||
# can format the date in any way needed by the template. ICS and Atom
|
||||
# have specific, and different, date and time formatting.
|
||||
$bug->{'changedtime'} = str2time($bug->{'changeddate'});
|
||||
$bug->{'changedtime'} = str2time($bug->{'changeddate'}, Bugzilla->params->{'timezone'});
|
||||
$bug->{'changeddate'} = DiffDate($bug->{'changeddate'});
|
||||
}
|
||||
|
||||
if ($bug->{'opendate'}) {
|
||||
# Put in the open date as a time for the template date plugin.
|
||||
$bug->{'opentime'} = str2time($bug->{'opendate'});
|
||||
$bug->{'opentime'} = str2time($bug->{'opendate'}, Bugzilla->params->{'timezone'});
|
||||
$bug->{'opendate'} = DiffDate($bug->{'opendate'});
|
||||
}
|
||||
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#
|
||||
# Contributor(s): William Jon McCann <mccann@jhu.edu>
|
||||
#%]
|
||||
[% PROCESS global/variables.none.tmpl %][% USE date %]
|
||||
[% PROCESS global/variables.none.tmpl %]
|
||||
BEGIN:VCALENDAR
|
||||
CALSCALE:GREGORIAN
|
||||
[%+ PROCESS ics_prodid +%]
|
||||
|
@ -32,7 +32,7 @@ BEGIN:VTODO
|
|||
[%+ PROCESS ics_status bug_status = bug.bug_status +%]
|
||||
[%+ PROCESS ics_dtstamp +%]
|
||||
[% IF bug.changeddate %]
|
||||
[%+ date.format(bug.changedtime,"%Y%m%dT%H%M%SZ") FILTER ics('LAST-MODIFIED') +%]
|
||||
[%+ time2str("%Y%m%dT%H%M%SZ", bug.changedtime, "UTC") FILTER ics('LAST-MODIFIED') +%]
|
||||
[% END %]
|
||||
[% IF bug.percentage_complete %]
|
||||
[%+ bug.percentage_complete FILTER format('%d') FILTER ics('PERCENT-COMPLETE') +%]
|
||||
|
@ -66,11 +66,11 @@ END:VCALENDAR
|
|||
[% END %]
|
||||
|
||||
[% BLOCK ics_dtstart %]
|
||||
[% date.format(bug.opentime,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTART') %]
|
||||
[% time2str("%Y%m%dT%H%M%SZ", bug.opentime, "UTC") FILTER ics('DTSTART') %]
|
||||
[% END %]
|
||||
|
||||
[% BLOCK ics_dtstamp %]
|
||||
[% date.format(date.now,"%Y%m%dT%H%M%SZ") FILTER ics('DTSTAMP') %]
|
||||
[% time2str("%Y%m%dT%H%M%SZ", currenttime, "UTC") FILTER ics('DTSTAMP') %]
|
||||
[% END %]
|
||||
|
||||
[% BLOCK ics_status %]
|
||||
|
|
Загрузка…
Ссылка в новой задаче