summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorByron Jones <glob@mozilla.com>2014-07-01 07:45:06 +0200
committerByron Jones <glob@mozilla.com>2014-07-01 07:45:06 +0200
commit48577f23ee0cccfcc476cbac477a9b30c5194fa9 (patch)
tree31537513371d05b87346059b0e4cc63b6e224086
parent14adc0f7da11b364f18e95435497b8069aa9fa30 (diff)
downloadbugzilla-48577f23ee0cccfcc476cbac477a9b30c5194fa9.tar.gz
bugzilla-48577f23ee0cccfcc476cbac477a9b30c5194fa9.tar.xz
Bug 1031428: Move the "Mentors" field under "QA Contact" field
-rw-r--r--extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl (renamed from extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl)3
-rw-r--r--template/en/default/bug/edit.html.tmpl4
2 files changed, 6 insertions, 1 deletions
diff --git a/extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
index 352dfa6c7..55f12e02d 100644
--- a/extensions/Review/template/en/default/hook/bug/edit-after_custom_fields.html.tmpl
+++ b/extensions/Review/template/en/default/hook/bug/edit-after_people.html.tmpl
@@ -17,7 +17,8 @@
<div id="bz_bug_mentors_edit_container" class="bz_default_hidden">
<span>
[% FOREACH mentor = bug.mentors %]
- [% INCLUDE global/user.html.tmpl who = mentor %]<br>
+ [% INCLUDE global/user.html.tmpl who = mentor %]
+ [% "<br>" UNLESS loop.last %]
[% END %]
(<a href="#" id="bz_bug_mentors_edit_action">edit</a>)
</span>
diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl
index c6f49e9b6..3ec871282 100644
--- a/template/en/default/bug/edit.html.tmpl
+++ b/template/en/default/bug/edit.html.tmpl
@@ -563,6 +563,10 @@
</td>
</tr>
[% END %]
+
+ [%# BMO - hook for adding mentors %]
+ [% Hook.process("after_people", "bug/edit.html.tmpl") %]
+
<script type="text/javascript">
assignToDefaultOnChange(['product', 'component'],
'[% bug.component_obj.default_assignee.login FILTER js %]',