Aklapper has uploaded a new change for review. https://gerrit.wikimedia.org/r/113685
Change subject: Upgrade custom code to Bugzilla 4.4.2 ...................................................................... Upgrade custom code to Bugzilla 4.4.2 Only commit together with applying http://ftp.mozilla.org/pub/mozilla.org/webtools/bugzilla-4.4.1-to-4.4.2-nodocs.diff.gz Bug: 61287 Change-Id: I6dd9c3d434f00b9cad472ad9587263d78def3d54 --- M Bugzilla/BugMail.pm M template/en/custom/bug/create/create-guided.html.tmpl 2 files changed, 14 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/bugzilla/modifications refs/changes/85/113685/1 diff --git a/Bugzilla/BugMail.pm b/Bugzilla/BugMail.pm index 65d3c7c..59806b0 100644 --- a/Bugzilla/BugMail.pm +++ b/Bugzilla/BugMail.pm @@ -113,15 +113,17 @@ if ($params->{dep_only}) { push(@diffs, { field_name => 'bug_status', - old => $params->{changes}->{bug_status}->[0], - new => $params->{changes}->{bug_status}->[1], + old => $params->{changes}->{bug_status}->[0], + new => $params->{changes}->{bug_status}->[1], login_name => $changer->login, - blocker => $params->{blocker} }, + who => $changer, + blocker => $params->{blocker} }, { field_name => 'resolution', - old => $params->{changes}->{resolution}->[0], - new => $params->{changes}->{resolution}->[1], + old => $params->{changes}->{resolution}->[0], + new => $params->{changes}->{resolution}->[1], login_name => $changer->login, - blocker => $params->{blocker} }); + who => $changer, + blocker => $params->{blocker} }); } else { push(@diffs, _get_diffs($bug, $end, \%user_cache)); @@ -523,7 +525,10 @@ # If there isn't anything to show, don't include this header. next unless $value; - push(@diffs, {field_name => $name, new => $value}); + push(@diffs, { + field_name => $name, + who => $bug->reporter, + new => $value}); } return @diffs; diff --git a/template/en/custom/bug/create/create-guided.html.tmpl b/template/en/custom/bug/create/create-guided.html.tmpl index f371acf..e3970f6 100644 --- a/template/en/custom/bug/create/create-guided.html.tmpl +++ b/template/en/custom/bug/create/create-guided.html.tmpl @@ -97,6 +97,7 @@ <script type="text/javascript"> var descriptions = [ [% FOREACH c = product.components %] + [% NEXT IF NOT c.is_active %] '[% c.description FILTER js %]', [% END %] ]; @@ -246,6 +247,7 @@ [% default.component_ = "General" %] [% END %] [% FOREACH c = product.components %] + [% NEXT IF NOT c.is_active %] <option value="[% c.name FILTER html %]" [% " selected=\"selected\"" IF c.name == default.component_ %]> [% c.name FILTER html %] -- To view, visit https://gerrit.wikimedia.org/r/113685 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6dd9c3d434f00b9cad472ad9587263d78def3d54 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/bugzilla/modifications Gerrit-Branch: master Gerrit-Owner: Aklapper <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
