Dzahn has submitted this change and it was merged. Change subject: [4.4] Upgrade InlineHistory extension ......................................................................
[4.4] Upgrade InlineHistory extension DO NOT COMMIT until Bugzilla has been upgraded to 4.4. Upgrade InlineHistory extension to make it work with 4.4. It's slightly messy upstream, for the records: https://bugzilla.mozilla.org/show_bug.cgi?id=935513 Change-Id: If0a1c4f13f59eb34c23587c85d4e5eda9fd7dc09 --- M extensions/InlineHistory/Extension.pm M extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl 2 files changed, 15 insertions(+), 10 deletions(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/extensions/InlineHistory/Extension.pm b/extensions/InlineHistory/Extension.pm index 60050e0..9089790 100644 --- a/extensions/InlineHistory/Extension.pm +++ b/extensions/InlineHistory/Extension.pm @@ -34,7 +34,9 @@ my $bug_id = $bug->id; # build bug activity - my ($activity) = Bugzilla::Bug::GetBugActivity($bug_id); + my ($activity) = $bug->can('get_activity') + ? $bug->get_activity() + : Bugzilla::Bug::GetBugActivity($bug_id); $activity = _add_duplicates($bug_id, $activity); if (scalar @$activity > MAXIMUM_ACTIVITY_COUNT) { diff --git a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl index 1c47fd2..ceb0929 100644 --- a/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl +++ b/extensions/InlineHistory/template/en/default/hook/bug/comments-aftercomments.html.tmpl @@ -25,14 +25,17 @@ [% FOREACH change = operation.changes %] [%# track flag changes %] [% IF change.fieldname == 'flagtypes.name' && change.added != '' %] - var item = new Array(5); - item[0] = '[% changer_login FILTER js %]'; - item[1] = '[% change_date FILTER js %]'; - item[2] = '[% change.attachid FILTER js %]'; - item[3] = '[% change.added FILTER js %]'; - item[4] = '[% changer_identity FILTER js %]'; - ih_activity_flags.push(item); - [% has_flag = 1 %] + [% new_flags = change.added.split('[ ,]+') %] + [% FOREACH new_flag IN new_flags %] + var item = new Array(5); + item[0] = '[% changer_login FILTER js %]'; + item[1] = '[% change_date FILTER js %]'; + item[2] = '[% change.attachid FILTER js %]'; + item[3] = '[% change.added FILTER js %]'; + item[4] = '[% changer_identity FILTER js %]'; + ih_activity_flags.push(item); + [% has_flag = 1 %] + [% END %] [% END %] [%# wrap CC changes in a span for toggling visibility %] @@ -138,7 +141,7 @@ [%~%]<a href="[% see_also FILTER html FILTER js %]" target="_blank"> [%~%][% see_also FILTER html FILTER js %]</a> [%- ", " IF NOT loop.last %] - [% END %] + [% END -%] [% ELSIF change.fieldname == 'assigned_to' || change.fieldname == 'reporter' || change.fieldname == 'qa_contact' || -- To view, visit https://gerrit.wikimedia.org/r/97994 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If0a1c4f13f59eb34c23587c85d4e5eda9fd7dc09 Gerrit-PatchSet: 2 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <aklap...@wikimedia.org> Gerrit-Reviewer: Dzahn <dz...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
