diff options
7 files changed, 75 insertions, 0 deletions
diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index 02824f471..1c25da749 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -65,6 +65,8 @@ our $VERSION = '0.1'; BEGIN { *Bugzilla::Bug::last_closed_date = \&_last_closed_date; *Bugzilla::Bug::reporters_hw_os = \&_bug_reporters_hw_os; + *Bugzilla::Bug::is_unassigned = \&_bug_is_unassigned; + *Bugzilla::Bug::has_patch = \&_bug_has_patch; *Bugzilla::Product::default_security_group = \&_default_security_group; *Bugzilla::Product::default_security_group_obj = \&_default_security_group_obj; *Bugzilla::Product::group_always_settable = \&_group_always_settable; @@ -761,6 +763,23 @@ sub _bug_reporters_hw_os { return $self->{ua_hw_os} = $hw_os; } +sub _bug_is_unassigned { + my ($self) = @_; + my $assignee = $self->assigned_to->login; + return $assignee eq 'nobody@mozilla.org' || $assignee =~ /\.bugs$/; +} + +sub _bug_has_patch { + my ($self) = @_; + foreach my $attachment (@{ $self->attachments }) { + return 1 if + $attachment->ispatch + || $attachment->contenttype eq 'text/x-github-pull-request' + || $attachment->contenttype eq 'text/x-review-board-request'; + } + return 0; +} + sub _product_default_platform_id { $_[0]->{default_platform_id} } sub _product_default_op_sys_id { $_[0]->{default_op_sys_id} } diff --git a/extensions/BMO/template/en/default/hook/attachment/list-warnings.html.tmpl b/extensions/BMO/template/en/default/hook/attachment/list-warnings.html.tmpl new file mode 100644 index 000000000..11998e12f --- /dev/null +++ b/extensions/BMO/template/en/default/hook/attachment/list-warnings.html.tmpl @@ -0,0 +1,18 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% + RETURN UNLESS user.in_group('editbugs'); + RETURN UNLESS bug.attachments.size && bug.is_unassigned && bug.has_patch; +%] +<tr class="bz_attach_footer"> + <td colspan="[% show_attachment_flags ? 3 : 2 %]" id="unassigned_with_patches"> + <img src="extensions/BMO/web/images/sign_warning.png" width="16" height="16"> + Unassigned [% terms.bug %] with patches attached + </td> +</tr> diff --git a/extensions/BMO/template/en/default/hook/bug_modal/attachments-warnings.html.tmpl b/extensions/BMO/template/en/default/hook/bug_modal/attachments-warnings.html.tmpl new file mode 100644 index 000000000..ca2a5a58c --- /dev/null +++ b/extensions/BMO/template/en/default/hook/bug_modal/attachments-warnings.html.tmpl @@ -0,0 +1,16 @@ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. + # + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. + #%] + +[% + RETURN UNLESS user.in_group('editbugs'); + RETURN UNLESS bug.attachments.size && bug.is_unassigned && bug.has_patch; +%] +<div id="unassigned_with_patches"> + <img src="extensions/BMO/web/images/sign_warning.png" width="16" height="16"> + Unassigned [% terms.bug %] with patches attached +</div> diff --git a/extensions/BMO/web/styles/bug_modal.css b/extensions/BMO/web/styles/bug_modal.css index 0c54ce64a..3de7bde8b 100644 --- a/extensions/BMO/web/styles/bug_modal.css +++ b/extensions/BMO/web/styles/bug_modal.css @@ -12,3 +12,11 @@ border: 1px solid #ddd; border-radius: 4px; } + +#unassigned_with_patches { + padding-left: 4px; +} + +#unassigned_with_patches img { + vertical-align: sub; +} diff --git a/extensions/BMO/web/styles/edit_bug.css b/extensions/BMO/web/styles/edit_bug.css index a5dc72d0c..7da05a126 100644 --- a/extensions/BMO/web/styles/edit_bug.css +++ b/extensions/BMO/web/styles/edit_bug.css @@ -39,3 +39,11 @@ input#cf_rank { text-align: right; width: 3em; } + +#unassigned_with_patches { + font-weight: normal; +} + +#unassigned_with_patches img { + vertical-align: sub; +} diff --git a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl index e5fd7a82c..1658a0408 100644 --- a/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl +++ b/extensions/BugModal/template/en/default/bug_modal/attachments.html.tmpl @@ -80,3 +80,6 @@ <button type="button" id="attachments-obsolete-btn" class="minor">Show Obsolete Attachments</button> [% END %] </div> + +[%# BMO - attachment related warnings %] +[% Hook.process("warnings") %] diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index c89c7bb78..2b0b31584 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -174,5 +174,8 @@ function toggle_display(link) { [% END %] </td> </tr> + + [%# BMO - attachment related warnings %] + [% Hook.process("warnings") %] </table> <br> |