diff options
4 files changed, 7 insertions, 21 deletions
diff --git a/extensions/Needinfo/Extension.pm b/extensions/Needinfo/Extension.pm index e47b3ed02..701c2de18 100644 --- a/extensions/Needinfo/Extension.pm +++ b/extensions/Needinfo/Extension.pm @@ -62,6 +62,11 @@ sub bug_end_of_update { return if $params->{needinfo_done}; + # do a match if applicable + Bugzilla::User::match_field({ + 'needinfo_from' => { 'type' => 'single' } + }); + my $needinfo = delete $params->{needinfo}; my $needinfo_from = delete $params->{needinfo_from}; my $needinfo_role = delete $params->{needinfo_role}; diff --git a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl index 516ec0087..8810b5f21 100644 --- a/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl +++ b/extensions/Needinfo/template/en/default/bug/needinfo.html.tmpl @@ -83,14 +83,4 @@ </span> [% END %] </div> - <script> - // HACK: Shift the needinfo container to a different location - // below commit button but before status drop down. This allows - // for better tab navigation - YAHOO.util.Event.onDOMReady(function() { - var needinfo = YAHOO.util.Dom.get('needinfo_container'); - var status = YAHOO.util.Dom.get('bug_status_bottom'); - status.parentNode.insertBefore(needinfo, status); - }); - </script> [% END %] diff --git a/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl b/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl deleted file mode 100644 index 90f0cc584..000000000 --- a/extensions/Needinfo/template/en/default/hook/bug/edit-after_comment_textarea.html.tmpl +++ /dev/null @@ -1,11 +0,0 @@ -[%# 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. - #%] - -[% PROCESS bug/needinfo.html.tmpl - bug = bug -%] diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 8d40e4ab7..b0c4e510e 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -1111,6 +1111,8 @@ <br> [% PROCESS commit_button id=""%] + [% Hook.process("after_comment_commit_button", 'bug/edit.html.tmpl') %] + <table id="bug_status_bottom" class="status" cellspacing="0" cellpadding="0"> <tr> |