diff --git a/mozilla/webtools/bugzilla/.bzrrev b/mozilla/webtools/bugzilla/.bzrrev index c543497f6a4..ed6110fd1bf 100644 --- a/mozilla/webtools/bugzilla/.bzrrev +++ b/mozilla/webtools/bugzilla/.bzrrev @@ -1 +1 @@ -8951 \ No newline at end of file +8952 \ No newline at end of file diff --git a/mozilla/webtools/bugzilla/buglist.cgi b/mozilla/webtools/bugzilla/buglist.cgi index ed716f2ff99..e0a4a6aaa28 100755 --- a/mozilla/webtools/bugzilla/buglist.cgi +++ b/mozilla/webtools/bugzilla/buglist.cgi @@ -553,6 +553,9 @@ if ($dotweak) { if ($format->{'extension'} eq 'ics') { push(@selectcolumns, "opendate") if !grep($_ eq 'opendate', @selectcolumns); + if (Bugzilla->params->{'timetrackinggroup'}) { + push(@selectcolumns, "deadline") if !grep($_ eq 'deadline', @selectcolumns); + } } if ($format->{'extension'} eq 'atom') { diff --git a/mozilla/webtools/bugzilla/template/en/default/list/list.ics.tmpl b/mozilla/webtools/bugzilla/template/en/default/list/list.ics.tmpl index 4295b4642cd..327ae171cfb 100644 --- a/mozilla/webtools/bugzilla/template/en/default/list/list.ics.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/list/list.ics.tmpl @@ -21,6 +21,9 @@ BEGIN:VTODO [% IF bug.changeddate %] [%+ bug.changedtime FILTER time("%Y%m%dT%H%M%SZ", "UTC") FILTER ics('LAST-MODIFIED') +%] [% END %] +[% IF bug.deadline %] +[%+ bug.deadline FILTER time("%Y%m%dT%H%M%SZ", "UTC") FILTER ics('DUE') +%] +[% END %] [% IF bug.percentage_complete %] [%+ bug.percentage_complete FILTER format('%d') FILTER ics('PERCENT-COMPLETE') +%] [% END %]